From 720ac6a91506b6f997f604f6579b6ab15ee80f68 Mon Sep 17 00:00:00 2001
From: shimun <shimun@shimun.net>
Date: Thu, 10 Dec 2020 21:06:35 +0100
Subject: [PATCH] u

---
 dracut/95fido2luks/module-setup.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dracut/95fido2luks/module-setup.sh b/dracut/95fido2luks/module-setup.sh
index 35c18fa..c915a4f 100755
--- a/dracut/95fido2luks/module-setup.sh
+++ b/dracut/95fido2luks/module-setup.sh
@@ -6,15 +6,10 @@ check () {
                 return 1
         fi
         return 255
-        set -e
-        bash -n "$moddir/generator.sh"
-        local tmp=$(mktemp -d -t dracut-fido2luks-XXX)
-        trap "rm -rf $tmp" EXIT
-        $moddir/generator.sh "" "" "$tmp" /etc/fido2luks.conf
 }
 
 depends () {
-        echo "systemd"
+        echo "systemd crypt"
         return 0
 }
 
@@ -23,7 +18,12 @@ mirror() {
 }
 
 install () {
-        inst "$moddir/generator.sh" "/etc/systemd/system-generators/fido2luks-generator.sh"
+        set -e
+        bash -n "$moddir/generator.sh"
+        local tmp=$(mktemp -d -t dracut-fido2luks-XXX)
+        trap "rm -rf $tmp" EXIT
+        $moddir/generator.sh "" "" "$tmp" /etc/fido2luks.conf
+        inst "$moddir/generator.sh" "$systemdutildir/system-generators/fido2luks-generator.sh"
         mirror "/usr/bin/fido2luks"
         mirror "/etc/fido2luks.conf"
         for config in /etc/fido2luks.conf.d/*;  do
@@ -32,9 +32,9 @@ install () {
         inst "$systemdutildir/systemd-cryptsetup"
         mkdir -p "$initdir/fido2luks"
 
-        inst "$moddir/fido2luks.target" "/etc/systemd/system/fido2luks.target"
-        mkdir -p "$initdir/etc/systemd/system/fido2luks.target.wants"
+        inst "$moddir/fido2luks.target" "$systemdunitdir/fido2luks.target"
+        mkdir -p "$systemdunitdir/fido2luks.target.wants"
 
-        mkdir -p "$initdir/etc/systemd/system/sysinit.target.wants"
-        ln -sf "/etc/systemd/system/fido2luks.target" "$initdir/etc/systemd/system/sysinit.target.wants/"
+        mkdir -p "$systemdunitdir/sysinit.target.wants"
+        ln -sf "$systemdunitdir/fido2luks.target" "$systemdunitdir/sysinit.target.wants/"
 }