diff --git a/README.md b/README.md index 8c7f31e..6c6722a 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 diff --git a/meson.build b/meson.build index e8969cc..3e6f611 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ # Project definition -project('zlevis', license: 'GPL3') +project('zlevis', license: 'GPL3', version: '1') # Define bindir bindir = join_paths(get_option('prefix'), get_option('bindir')) diff --git a/src/zlevis-encrypt b/src/zlevis-encrypt index 6700bbe..d9a06ed 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