From cc1a1b7065d0292ecaa9cdeb9434d38b02ceef88 Mon Sep 17 00:00:00 2001 From: Luc Date: Fri, 1 Aug 2025 20:02:36 +0200 Subject: [PATCH 1/3] README.md: update --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6c6722a..8c7f31e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Zlevis +# zlevis A minimal fork of [Clevis](https://github.com/latchset/clevis), rewritten in POSIX shell to accommodate automatic decryption of a ZFS root pool with TPM2. ## Installation -Zlevis can be installed with `meson`, after cloning the repository, setup the build directory +`zlevis` can be installed with `meson`, after cloning the repository, setup the build directory: ``` $ meson setup builddir @@ -14,7 +14,7 @@ $ meson setup builddir > Using the `--reconfigure` flag will reconfigure the build directory. -Installation of the zlevis scripts is now performed with +Installation of the `zlevis` scripts is now performed with: ``` # meson install -C builddir From fb6d31b727a51c5fe2a3172b1bc396710f8f03b9 Mon Sep 17 00:00:00 2001 From: Luc Date: Fri, 1 Aug 2025 21:16:02 +0200 Subject: [PATCH 2/3] meson.build: remove version --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3e6f611..e8969cc 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ # Project definition -project('zlevis', license: 'GPL3', version: '1') +project('zlevis', license: 'GPL3') # Define bindir bindir = join_paths(get_option('prefix'), get_option('bindir')) From d415066add315110214e73063cf7c5f64082648e Mon Sep 17 00:00:00 2001 From: Luc Date: Fri, 1 Aug 2025 21:16:32 +0200 Subject: [PATCH 3/3] src/zlevis-encrypt: update Reverted prior adaptation in parsing policy_options in tpm2_create due to incombatility with systems using busybox --- src/zlevis-encrypt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zlevis-encrypt b/src/zlevis-encrypt index d9a06ed..6700bbe 100755 --- a/src/zlevis-encrypt +++ b/src/zlevis-encrypt @@ -186,7 +186,7 @@ trap 'rm -f "$tmp_primary_context" "$tmp_pcr_policy" "$tmp_jwk_pub" "$tmp_jwk_pr # Create the TPM2 object for the JWK case "$tpm2tools_version" in - 4|5) printf "%s" "$jwk" | tpm2_create -Q -g "$hash" -C "$tmp_primary_context" -u "$tmp_jwk_pub" -r "$tmp_jwk_priv" -a "$obj_attr" -L "${policy_options[@]}" -i- || fail=$?;; + 4|5) printf "%s" "$jwk" | tpm2_create -Q -g "$hash" -C "$tmp_primary_context" -u "$tmp_jwk_pub" -r "$tmp_jwk_priv" -a "$obj_attr" -L "$policy_options" -i- || fail=$?;; *) fail=1;; esac if [ -n "$fail" ]; then