diff --git a/README.md b/README.md index 5c502bc..9546309 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ git clone https://github.com/shimunn/fido2luks.git && cd fido2luks #Alternativly cargo build --release && sudo cp target/release/fido2luks /usr/bin/ CARGO_INSTALL_ROOT=/usr sudo -E cargo install -f --path . -echo FIDO2LUKS_CREDENTIAL_ID=$(fido2luks credential) >> fido2luks.conf +echo FIDO2LUKS_CREDENTIAL_ID=$(fido2luks credential) >> dracut/96luks-2fa/fido2luks.conf set -a -. fido2luks.conf +. dracut/96luks-2fa/fido2luks.conf #Repeat for each luks volume sudo -E fido2luks -i add-key /dev/disk/by-uuid/ @@ -56,7 +56,7 @@ I'd also recommend to copy the executable onto /boot so that it is accessible in ``` mkdir /boot/fido2luks/ cp /usr/bin/fido2luks /boot/fido2luks/ -cp fido2luks.conf /boot/fido2luks/ +cp /etc/fido2luks.conf /boot/fido2luks/ ``` ## Test diff --git a/dracut/96luks-2fa/fido2luks.conf b/dracut/96luks-2fa/fido2luks.conf new file mode 100644 index 0000000..96a01b7 --- /dev/null +++ b/dracut/96luks-2fa/fido2luks.conf @@ -0,0 +1,3 @@ +FIDO2LUKS_SALT=Ask +FIDO2LUKS_PASSWORD_HELPER=/usr/bin/systemd-ask-password Please enter second factor for LUKS disk encryption + diff --git a/dracut/96luks-2fa/luks-2fa-generator.sh b/dracut/96luks-2fa/luks-2fa-generator.sh index 37b182c..ee45621 100755 --- a/dracut/96luks-2fa/luks-2fa-generator.sh +++ b/dracut/96luks-2fa/luks-2fa-generator.sh @@ -32,7 +32,7 @@ generate_service () { printf -- "\n\n[Service]" printf -- "\nType=oneshot" printf -- "\nRemainAfterExit=yes" - printf -- "\nEnvironmentFile='%s'" "/etc/luks-2fa.conf" + printf -- "\nEnvironmentFile=%s" "/etc/fido2luks.conf" printf -- "\nEnvironment=FIDO2LUKS_CREDENTIAL_ID='%s'" "$credential_id" printf -- "\nKeyringMode=%s" "shared" printf -- "\nExecStartPre=-/usr/bin/plymouth display-message --text \"${CON_MSG}\"" diff --git a/dracut/96luks-2fa/luks-2fa.conf b/dracut/96luks-2fa/luks-2fa.conf deleted file mode 100644 index c34bd13..0000000 --- a/dracut/96luks-2fa/luks-2fa.conf +++ /dev/null @@ -1 +0,0 @@ -FIDO2LUKS_SALT=Ask \ No newline at end of file diff --git a/dracut/96luks-2fa/module-setup.sh b/dracut/96luks-2fa/module-setup.sh index 8471076..e111497 100755 --- a/dracut/96luks-2fa/module-setup.sh +++ b/dracut/96luks-2fa/module-setup.sh @@ -18,7 +18,7 @@ depends () { install () { inst "$moddir/luks-2fa-generator.sh" "/etc/systemd/system-generators/luks-2fa-generator.sh" inst_simple "/usr/bin/fido2luks" "/usr/bin/fido2luks" - inst_simple "$moddir/luks-2fa.conf" "/etc/luks-2fa.conf" + inst_simple "/etc/fido2luks.conf" "/etc/fido2luks.conf" inst "$systemdutildir/systemd-cryptsetup" mkdir -p "$initdir/luks-2fa" diff --git a/dracut/Makefile b/dracut/Makefile index f07cf93..21e1e17 100644 --- a/dracut/Makefile +++ b/dracut/Makefile @@ -15,6 +15,7 @@ help: install: cp ${MODULE_CONF_D}/${MODULE_CONF} ${DRACUT_CONF_D}/ cp -r ${MODULE_DIR} ${DRACUT_MODULES_D}/ + cp ${MODULE_DIR}/fido2luks.conf /etc/fido2luks.conf dracut -fv clean: rm ${DRACUT_CONF_D}/${MODULE_CONF}