diff options
| author | Michael Biebl <biebl@debian.org> | 2013-03-09 09:46:11 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-03-09 10:05:01 +0100 |
| commit | 7b40ce553f0ec9487077e53f5bdc46580025901c (patch) | |
| tree | 98978d9f3b3e4ce4c6ebaad4b4a0b0c28e803add | |
| parent | analyze: use defines where we don't need static variables (diff) | |
| download | systemd-7b40ce553f0ec9487077e53f5bdc46580025901c.tar.xz systemd-7b40ce553f0ec9487077e53f5bdc46580025901c.zip | |
build-sys: don't hard-code binary paths in initrd-*.service
Instead use @bindir@ for udevadm and @rootbindir@ for systemctl.
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | units/initrd-cleanup.service.in (renamed from units/initrd-cleanup.service) | 2 | ||||
| -rw-r--r-- | units/initrd-parse-etc.service.in (renamed from units/initrd-parse-etc.service) | 6 | ||||
| -rw-r--r-- | units/initrd-switch-root.service.in (renamed from units/initrd-switch-root.service) | 2 | ||||
| -rw-r--r-- | units/initrd-udevadm-cleanup-db.service.in (renamed from units/initrd-udevadm-cleanup-db.service) | 2 |
5 files changed, 16 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 05bf582e26..afd259a2e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -382,11 +382,7 @@ dist_systemunit_DATA = \ units/systemd-udevd-control.socket \ units/systemd-udevd-kernel.socket \ units/system-update.target \ - units/initrd-parse-etc.service \ - units/initrd-cleanup.service \ - units/initrd-switch-root.target \ - units/initrd-udevadm-cleanup-db.service \ - units/initrd-switch-root.service + units/initrd-switch-root.target nodist_systemunit_DATA = \ units/getty@.service \ @@ -418,7 +414,11 @@ nodist_systemunit_DATA = \ units/systemd-udevd.service \ units/systemd-udev-trigger.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 = \ units/user/default.target \ @@ -460,6 +460,10 @@ EXTRA_DIST += \ units/systemd-hybrid-sleep.service.in \ units/systemd-suspend.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 \ man/custom-html.xsl diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service.in index 89986964ea..e926a1eec2 100644 --- a/units/initrd-cleanup.service +++ b/units/initrd-cleanup.service.in @@ -15,4 +15,4 @@ After=local-fs.target swap.target [Service] Type=oneshot -ExecStart=/usr/bin/systemctl --no-block isolate initrd-switch-root.target +ExecStart=@rootbindir@/systemctl --no-block isolate initrd-switch-root.target diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service.in index 3a71a7ec56..1a2711ac62 100644 --- a/units/initrd-parse-etc.service +++ b/units/initrd-parse-etc.service.in @@ -15,6 +15,6 @@ ConditionPathExists=/etc/initrd-release [Service] Type=oneshot -ExecStartPre=/usr/bin/systemctl daemon-reload -ExecStart=/usr/bin/systemctl start local-fs.target -ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service +ExecStartPre=@rootbindir@/systemctl daemon-reload +ExecStart=@rootbindir@/systemctl start local-fs.target +ExecStart=@rootbindir@/systemctl --no-block start initrd-cleanup.service diff --git a/units/initrd-switch-root.service b/units/initrd-switch-root.service.in index e076b391de..6740264149 100644 --- a/units/initrd-switch-root.service +++ b/units/initrd-switch-root.service.in @@ -15,5 +15,5 @@ AllowIsolate=yes [Service] Type=oneshot # 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 diff --git a/units/initrd-udevadm-cleanup-db.service b/units/initrd-udevadm-cleanup-db.service.in index 983189e8b0..b800c210db 100644 --- a/units/initrd-udevadm-cleanup-db.service +++ b/units/initrd-udevadm-cleanup-db.service.in @@ -15,4 +15,4 @@ Before=initrd-switch-root.target [Service] Type=oneshot -ExecStart=-/usr/bin/udevadm info --cleanup-db +ExecStart=-@bindir@/udevadm info --cleanup-db |