From afcb48110b76184eb04b6d08a0a1d824290e71e9 Mon Sep 17 00:00:00 2001
From: shimunn <shimun@shimun.net>
Date: Sat, 21 Sep 2019 01:01:29 +0200
Subject: [PATCH] -> WIP

---
 dracut/96luks-2fa/fido2-connected.service | 2 +-
 dracut/96luks-2fa/luks-2fa-generator.sh   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dracut/96luks-2fa/fido2-connected.service b/dracut/96luks-2fa/fido2-connected.service
index 771bca6..a150e33 100644
--- a/dracut/96luks-2fa/fido2-connected.service
+++ b/dracut/96luks-2fa/fido2-connected.service
@@ -5,6 +5,6 @@ Description=Wait for a FIDO2 device to be connected
 Type=oneshot
 Environment=CON_MSG="Please connect your authenicator"
 ExecStartPre=/usr/bin/plymouth display-message --text "${CON_MSG}"
-ExecStart=/bin/bash -c 'while ! fido2luks connected; do sleep 1; done'
+ExecStart=/bin/bash -c 'while ! /usr/bin/fido2luks connected; do /usr/bin/sleep 1; done'
 ExecStopPost=/usr/bin/plymouth hide-message --text "${CON_MSG}"
 
diff --git a/dracut/96luks-2fa/luks-2fa-generator.sh b/dracut/96luks-2fa/luks-2fa-generator.sh
index 7ea465c..e38b8af 100755
--- a/dracut/96luks-2fa/luks-2fa-generator.sh
+++ b/dracut/96luks-2fa/luks-2fa-generator.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NORMAL_DIR="/run/systemd/system"
+NORMAL_DIR="/tmp//run/systemd/system"
 LUKS_2FA_WANTS="/etc/systemd/system/luks-2fa.target.wants"
 
 CRYPTSETUP="/usr/lib/systemd/systemd-cryptsetup"
@@ -23,7 +23,7 @@ generate_service () {
                 printf -- "[Unit]"
                 printf -- "\nDescription=%s" "2fa for luks"
                 printf -- "\nBindsTo=%s" "$target_dev"
-                printf -- "\nAfter=%s cryptsetup-pre.target fido2-connected.service systemd-journald.socket" "$target_dev" #TODO: create service to wait or authenicator
+                printf -- "\nAfter=%s cryptsetup-pre.target systemd-journald.socket" "$target_dev" #TODO: create service to wait or authenicator
                 printf -- "\nBefore=%s umount.target luks-2fa.target" "$crypto_target_service"
                 printf -- "\nConflicts=umount.target"
                 printf -- "\nDefaultDependencies=no"
@@ -50,7 +50,7 @@ generate_service () {
                 printf -- "\nConditionPathExists=!/dev/mapper/luks-%s" "$target_uuid"
         } > "${sd_dir}/${crypto_target_service}.d/drop-in.conf"
 
-        ln -sf "$sd_service" "${LUKS_2FA_WANTS}/"
+       # ln -sf "$sd_service" "${LUKS_2FA_WANTS}/"
 }
 
 parse_cmdline () {
@@ -81,4 +81,5 @@ generate_from_cmdline () {
         done
 }
 
-generate_from_cmdline
+#generate_from_cmdline
+generate_service CRED UUID $timeout