shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

build-sys: don't hard-code binary paths in initrd-*.service

Browse Source 
Instead use @bindir@ for udevadm and @rootbindir@ for systemctl.
This commit is contained in:
Michael Biebl 2013-03-09 09:46:11 +01:00
parent 2f6eb835ca
commit 7b40ce553f
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -382,11 +382,7 @@ dist_systemunit_DATA = \
units/systemd-udevd-control.socket \ units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \ units/systemd-udevd-kernel.socket \
units/system-update.target \ units/system-update.target \
units/initrd-parse-etc.service \ units/initrd-switch-root.target
units/initrd-cleanup.service \
units/initrd-switch-root.target \
units/initrd-udevadm-cleanup-db.service \
units/initrd-switch-root.service
nodist_systemunit_DATA = \ nodist_systemunit_DATA = \
units/getty@.service \ units/getty@.service \
@ -418,7 +414,11 @@ nodist_systemunit_DATA = \
units/systemd-udevd.service \ units/systemd-udevd.service \
units/systemd-udev-trigger.service \ units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \ units/systemd-udev-settle.service \
units/debug-shell.service units/debug-shell.service \
units/initrd-parse-etc.service \
units/initrd-cleanup.service \
units/initrd-udevadm-cleanup-db.service \
units/initrd-switch-root.service
dist_userunit_DATA = \ dist_userunit_DATA = \
units/user/default.target \ units/user/default.target \
@ -460,6 +460,10 @@ EXTRA_DIST += \
units/systemd-hybrid-sleep.service.in \ units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \ units/systemd-suspend.service.in \
units/quotaon.service.in \ units/quotaon.service.in \
units/initrd-parse-etc.service.in \
units/initrd-cleanup.service.in \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
introspect.awk \ introspect.awk \
man/custom-html.xsl man/custom-html.xsl

2
units/initrd-cleanup.service → units/initrd-cleanup.service.in
View File

@ -15,4 +15,4 @@ After=local-fs.target swap.target
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/bin/systemctl --no-block isolate initrd-switch-root.target ExecStart=@rootbindir@/systemctl --no-block isolate initrd-switch-root.target

6
units/initrd-parse-etc.service → units/initrd-parse-etc.service.in
View File

@ -15,6 +15,6 @@ ConditionPathExists=/etc/initrd-release
[Service] [Service]
Type=oneshot Type=oneshot
ExecStartPre=/usr/bin/systemctl daemon-reload ExecStartPre=@rootbindir@/systemctl daemon-reload
ExecStart=/usr/bin/systemctl start local-fs.target ExecStart=@rootbindir@/systemctl start local-fs.target
ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service ExecStart=@rootbindir@/systemctl --no-block start initrd-cleanup.service

2
units/initrd-switch-root.service → units/initrd-switch-root.service.in
View File

@ -15,5 +15,5 @@ AllowIsolate=yes
[Service] [Service]
Type=oneshot Type=oneshot
# we have to use "--force" here, otherwise systemd would umount /run # we have to use "--force" here, otherwise systemd would umount /run
ExecStart=/usr/bin/systemctl --no-block --force switch-root /sysroot ExecStart=@rootbindir@/systemctl --no-block --force switch-root /sysroot
KillMode=none KillMode=none

2
units/initrd-udevadm-cleanup-db.service → units/initrd-udevadm-cleanup-db.service.in
View File

@ -15,4 +15,4 @@ Before=initrd-switch-root.target
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=-/usr/bin/udevadm info --cleanup-db ExecStart=-@bindir@/udevadm info --cleanup-db