Fix dracut unlocker

We weren't generating the path to clevis-luks-askpass correctly in the dracut module. Fixes: #23
latchset · Nov 13, 2017 · bcb46fe · bcb46fe
1 parent 7f335a0
commit bcb46fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/dracut/Makefile.am b/src/dracut/Makefile.am
@@ -1,12 +1,10 @@
 dracutdir = @dracutmodulesdir@/60$(PACKAGE_NAME)
-nodist_dracut_SCRIPTS = clevis-hook.sh
-dist_dracut_SCRIPTS = module-setup.sh
-
-CLEANFILES=clevis-hook.sh
-EXTRA_DIST=clevis-hook.sh.in
+nodist_dracut_SCRIPTS = clevis-hook.sh module-setup.sh
+EXTRA_DIST=clevis-hook.sh.in module-setup.sh.in
+CLEANFILES=clevis-hook.sh module-setup.sh
 
 %: %.in
 	$(AM_V_GEN)mkdir -p $(dir $@)
 	$(AM_V_GEN)$(SED) \
-		-e 's,@libexedir\@,$(libexecdir),g' \
+		-e 's,@libexecdir\@,$(libexecdir),g' \
 		$(srcdir)/$@.in > $@
diff --git a/src/dracut/clevis-hook.sh.in b/src/dracut/clevis-hook.sh.in
@@ -1,2 +1,2 @@
 #!/bin/bash
-@libexec@/clevis-luks-askpass
+@libexecdir@/clevis-luks-askpass
diff --git a/src/dracut/module-setup.sh → src/dracut/module-setup.sh.in b/src/dracut/module-setup.sh → src/dracut/module-setup.sh.in
@@ -37,7 +37,7 @@ install() {
         clevis-decrypt-http \
         clevis-decrypt-tang \
         clevis-decrypt-sss \
-        clevis-luks-askpass \
+        @libexecdir@/clevis-luks-askpass \
         clevis-decrypt \
         luksmeta \
         clevis \