Skip to content

Commit ed1334d

Browse files
committed
Use INSTALL after sed in Makefile for install targets
Install sets the file permissions; sed might default to setting file permissions incorrectly. 0755 for files that might need to be executed; 0644 for those that will not. Signed-off-by: mulhern <[email protected]>
1 parent 1b360b6 commit ed1334d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ install-dbus-cfg:
245245
install-dracut-cfg:
246246
mkdir -p $(DESTDIR)$(DRACUTDIR)/modules.d
247247
$(INSTALL) -Dpm0755 -d $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis
248-
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' dracut/90stratis/stratisd-min.service.in > $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis/stratisd-min.service
249-
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' dracut/90stratis/module-setup.sh.in > $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis/module-setup.sh
248+
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' dracut/90stratis/stratisd-min.service.in | $(INSTALL) -Dpm0644 /dev/stdin $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis/stratisd-min.service
249+
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' dracut/90stratis/module-setup.sh.in | $(INSTALL) -Dpm0755 /dev/stdin $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis/module-setup.sh
250250
$(INSTALL) -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/stratis-rootfs-setup
251251
$(INSTALL) -Dpm0644 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/61-stratisd.rules
252252
$(INSTALL) -Dpm0755 -d $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis
@@ -256,10 +256,10 @@ install-dracut-cfg:
256256
## Install systemd configuration
257257
install-systemd-cfg:
258258
mkdir -p $(DESTDIR)$(UNITDIR)
259-
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' systemd/stratisd.service.in > $(DESTDIR)$(UNITDIR)/stratisd.service
260-
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' systemd/stratisd-min-postinitrd.service.in > $(DESTDIR)$(UNITDIR)/stratisd-min-postinitrd.service
261-
sed 's|@UNITEXECDIR@|$(UNITEXECDIR)|' systemd/[email protected] > $(DESTDIR)$(UNITDIR)/[email protected]
262-
sed 's|@UNITEXECDIR@|$(UNITEXECDIR)|' systemd/[email protected] > $(DESTDIR)$(UNITDIR)/[email protected]
259+
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' systemd/stratisd.service.in | $(INSTALL) -Dpm0644 /dev/stdin $(DESTDIR)$(UNITDIR)/stratisd.service
260+
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' systemd/stratisd-min-postinitrd.service.in | $(INSTALL) -Dpm0644 /dev/stdin $(DESTDIR)$(UNITDIR)/stratisd-min-postinitrd.service
261+
sed 's|@UNITEXECDIR@|$(UNITEXECDIR)|' systemd/[email protected] | $(INSTALL) -Dpm0644 /dev/stdin $(DESTDIR)$(UNITDIR)/[email protected]
262+
sed 's|@UNITEXECDIR@|$(UNITEXECDIR)|' systemd/[email protected] | $(INSTALL) -Dpm0644 /dev/stdin $(DESTDIR)$(UNITDIR)/[email protected]
263263

264264
## Install scripts
265265
install-scripts:

0 commit comments

Comments
 (0)