Skip to content

Reflect changes to LIBEXECDIR and UNITEXECDIR in systemd units #3064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mulkieran merged 1 commit into from
Aug 2, 2022
Merged

Reflect changes to LIBEXECDIR and UNITEXECDIR in systemd units #3064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,11 @@ stratisd-min:
cargo build --bin=stratisd-min ${SYSTEMD_FEATURES} ${TARGET_ARGS}

install-cfg:
mkdir -p $(DESTDIR)$(UNITDIR)
install -Dpm0644 -t $(DESTDIR)$(DATADIR)/dbus-1/system.d stratisd.conf
install -Dpm0644 -t $(DESTDIR)$(MANDIR)/man8 docs/stratisd.8
install -Dpm0644 -t $(DESTDIR)$(UDEVDIR)/rules.d udev/61-stratisd.rules
install -Dpm0644 -t $(DESTDIR)$(UNITDIR) systemd/stratisd.service
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' systemd/stratisd.service.in > $(DESTDIR)$(UNITDIR)/stratisd.service
install -Dpm0755 -d $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis
install -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/module-setup.sh
install -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis dracut/90stratis/stratis-rootfs-setup
Expand All @@ -236,8 +237,8 @@ install-cfg:
install -Dpm0755 -d $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis
install -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis dracut/90stratis-clevis/module-setup.sh
install -Dpm0755 -t $(DESTDIR)$(DRACUTDIR)/modules.d/90stratis-clevis dracut/90stratis-clevis/stratis-clevis-rootfs-setup
install -Dpm0644 -t $(DESTDIR)$(UNITDIR) systemd/stratisd-min-postinitrd.service
install -Dpm0644 -t $(DESTDIR)$(UNITDIR) systemd/stratis-fstab-setup@.service
sed 's|@LIBEXECDIR@|$(LIBEXECDIR)|' systemd/stratisd-min-postinitrd.service.in > $(DESTDIR)$(UNITDIR)/stratisd-min-postinitrd.service
sed 's|@UNITEXECDIR@|$(UNITEXECDIR)|' systemd/stratis-fstab-setup@.service.in > $(DESTDIR)$(UNITDIR)/stratis-fstab-setup@.service

install: install-cfg
mkdir -p $(DESTDIR)$(UNITGENDIR)
Expand Down
2 changes: 1 addition & 1 deletion systemd/stratis-fstab-setup@.service → systemd/stratis-fstab-setup@.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ DefaultDependencies=no
Requires=stratisd-min-postinitrd.service

[Service]
ExecStart=/usr/lib/systemd/stratis-fstab-setup %i
ExecStart=@UNITEXECDIR@/stratis-fstab-setup %i
Type=oneshot
2 changes: 1 addition & 1 deletion systemd/stratisd-min-postinitrd.service → systemd/stratisd-min-postinitrd.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Requires=systemd-udevd.service
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
2 changes: 1 addition & 1 deletion systemd/stratisd.service → systemd/stratisd.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DefaultDependencies=no
BusName=org.storage.stratis3
Type=dbus
Environment="RUST_BACKTRACE=1"
ExecStart=/usr/libexec/stratisd --log-level debug
ExecStart=@LIBEXECDIR@/stratisd --log-level debug
KillSignal=SIGINT
KillMode=process
Restart=on-abort
Expand Down