summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-03-09 09:46:11 +0100
committerMichael Biebl <biebl@debian.org>2013-03-09 10:05:01 +0100
commit7b40ce553f0ec9487077e53f5bdc46580025901c (patch)
tree98978d9f3b3e4ce4c6ebaad4b4a0b0c28e803add /units
parent2f6eb835ca05816142899188a3c9da30d3138efe (diff)
build-sys: don't hard-code binary paths in initrd-*.service
Instead use @bindir@ for udevadm and @rootbindir@ for systemctl.
Diffstat (limited to 'units')
-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
4 files changed, 6 insertions, 6 deletions
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