luks: move dracut out of systemd directory

Prepare to decouple dracut and systemd unlockers.
latchset · Jan 17, 2024 · cfefdde · cfefdde
1 parent ec16c7a
commit cfefdde
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 4 deletions.
diff --git a/...ystemd/dracut/clevis-pin-null/meson.build → src/luks/dracut/clevis-pin-null/meson.build b/...ystemd/dracut/clevis-pin-null/meson.build → src/luks/dracut/clevis-pin-null/meson.build
diff --git a/...dracut/clevis-pin-null/module-setup.sh.in → ...dracut/clevis-pin-null/module-setup.sh.in b/...dracut/clevis-pin-null/module-setup.sh.in → ...dracut/clevis-pin-null/module-setup.sh.in
diff --git a/...systemd/dracut/clevis-pin-sss/meson.build → src/luks/dracut/clevis-pin-sss/meson.build b/...systemd/dracut/clevis-pin-sss/meson.build → src/luks/dracut/clevis-pin-sss/meson.build
diff --git a/.../dracut/clevis-pin-sss/module-setup.sh.in → .../dracut/clevis-pin-sss/module-setup.sh.in b/.../dracut/clevis-pin-sss/module-setup.sh.in → .../dracut/clevis-pin-sss/module-setup.sh.in
diff --git a/...ystemd/dracut/clevis-pin-tang/meson.build → src/luks/dracut/clevis-pin-tang/meson.build b/...ystemd/dracut/clevis-pin-tang/meson.build → src/luks/dracut/clevis-pin-tang/meson.build
diff --git a/...dracut/clevis-pin-tang/module-setup.sh.in → ...dracut/clevis-pin-tang/module-setup.sh.in b/...dracut/clevis-pin-tang/module-setup.sh.in → ...dracut/clevis-pin-tang/module-setup.sh.in
diff --git a/...ystemd/dracut/clevis-pin-tpm2/meson.build → src/luks/dracut/clevis-pin-tpm2/meson.build b/...ystemd/dracut/clevis-pin-tpm2/meson.build → src/luks/dracut/clevis-pin-tpm2/meson.build
diff --git a/...dracut/clevis-pin-tpm2/module-setup.sh.in → ...dracut/clevis-pin-tpm2/module-setup.sh.in b/...dracut/clevis-pin-tpm2/module-setup.sh.in → ...dracut/clevis-pin-tpm2/module-setup.sh.in
diff --git a/...s/systemd/dracut/clevis/clevis-hook.sh.in → src/luks/dracut/clevis/clevis-hook.sh.in b/...s/systemd/dracut/clevis/clevis-hook.sh.in → src/luks/dracut/clevis/clevis-hook.sh.in
diff --git a/src/luks/systemd/dracut/clevis/meson.build → src/luks/dracut/clevis/meson.build b/src/luks/systemd/dracut/clevis/meson.build → src/luks/dracut/clevis/meson.build
diff --git a/.../systemd/dracut/clevis/module-setup.sh.in → src/luks/dracut/clevis/module-setup.sh.in b/.../systemd/dracut/clevis/module-setup.sh.in → src/luks/dracut/clevis/module-setup.sh.in
@@ -27,7 +27,10 @@ install() {
     if dracut_module_included "systemd"; then
         inst_multiple \
             $systemdsystemunitdir/clevis-luks-askpass.service \
-            $systemdsystemunitdir/clevis-luks-askpass.path
+            $systemdsystemunitdir/clevis-luks-askpass.path \
+            @SYSTEMD_REPLY_PASS@ \
+            @libexecdir@/clevis-luks-askpass
+
         systemctl -q --root "$initdir" add-wants cryptsetup.target clevis-luks-askpass.path
     else
         inst_hook initqueue/online 60 "$moddir/clevis-hook.sh"
@@ -36,8 +39,6 @@ install() {
 
     inst_multiple \
         /etc/services \
-        @SYSTEMD_REPLY_PASS@ \
-        @libexecdir@/clevis-luks-askpass \
         clevis-luks-common-functions \
         grep sed cut \
         clevis-decrypt \

diff --git a/src/luks/systemd/dracut/meson.build → src/luks/dracut/meson.build b/src/luks/systemd/dracut/meson.build → src/luks/dracut/meson.build
diff --git a/src/luks/meson.build b/src/luks/meson.build
@@ -34,6 +34,9 @@ clevis_luks_unbind = configure_file(input: 'clevis-luks-unbind.in',
 
 if libcryptsetup.found() and luksmeta.found()
   subdir('systemd')
+  # systemd should come before dracut in order to set up
+  # variables like SYSTEMD_REPLY_PASS.
+  subdir('dracut')
   subdir('udisks2')
 
   bins += clevis_luks_unbind

diff --git a/src/luks/systemd/meson.build b/src/luks/systemd/meson.build
@@ -10,7 +10,6 @@ sd_reply_pass = find_program(
 
 if systemd.found() and sd_reply_pass.found()
   data.set('SYSTEMD_REPLY_PASS', sd_reply_pass.path())
-  subdir('dracut')
 
   unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')