Merge pull request #3514 from mulkieran/issue_stratisd_3378

Parameterize /usr/libexec everywhere
stratis-storage · Dec 4, 2023 · 7ffe13a · 7ffe13a
2 parents b36b8ee + b38b962
commit 7ffe13a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -294,9 +294,9 @@ install-dbus-cfg:
 install-dracut-cfg:
 	mkdir -p $(DESTDIR)$(DRACUTDIR)/modules.d
 	$(INSTALL) -Dpm0755 -d $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis
-	$(INSTALL) -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/module-setup.sh
+	sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' dracut/90stratis/stratisd-min.service.in > $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis/stratisd-min.service
+	sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' dracut/90stratis/module-setup.sh.in > $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis/module-setup.sh
 	$(INSTALL) -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/stratis-rootfs-setup
-	$(INSTALL) -Dpm0644 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/stratisd-min.service
 	$(INSTALL) -Dpm0644 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/61-stratisd.rules
 	$(INSTALL) -Dpm0755 -d $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis
 	$(INSTALL) -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis dracut/90stratis-clevis/module-setup.sh

diff --git a/dracut/90stratis/module-setup.sh → dracut/90stratis/module-setup.sh.in b/dracut/90stratis/module-setup.sh → dracut/90stratis/module-setup.sh.in
@@ -3,7 +3,7 @@
 # called by dracut
 check() {
 	require_binaries stratis-min \
-		/usr/libexec/stratisd-min \
+		@LIBEXECDIR@/stratisd-min \
 		$systemdutildir/system-generators/stratis-setup-generator \
 		thin_check \
 		thin_repair \
@@ -34,7 +34,7 @@ installkernel() {
 install() {
 	# Stratis dependencies
 	inst_multiple stratis-min \
-		/usr/libexec/stratisd-min \
+		@LIBEXECDIR@/stratisd-min \
 		thin_check \
 		thin_repair \
 		mkfs.xfs \

diff --git a/dracut/90stratis/stratisd-min.service → dracut/90stratis/stratisd-min.service.in b/dracut/90stratis/stratisd-min.service → dracut/90stratis/stratisd-min.service.in
@@ -8,7 +8,7 @@ After=sysinit.target
 Type=notify
 Environment="RUST_BACKTRACE=1"
 ExecStartPre=-mkdir -p /run/cryptsetup
-ExecStart=/usr/libexec/stratisd-min --log-level debug
+ExecStart=@LIBEXECDIR@/stratisd-min --log-level debug
 KillSignal=SIGINT
 KillMode=process
 Restart=on-abort