diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-04-04 00:22:21 -0400 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2012-04-04 06:46:35 +0200 |
| commit | 9cf2578683de834026f501c24a0f5d3d0991d0a6 (patch) | |
| tree | 754bd599f15dee874b2c50f33c68df386e569e6e | |
| parent | 9b1a953e08917030489cd9adb2a17dfd407ce14b (diff) | |
units/: use @SYSTEMCTL@ instead of hardcoded paths
Especially in the case of --enable-split-usr, several units will point
to the wrong location for systemctl. Use @SYSTEMCTL@ which will always
contain the proper path.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | units/.gitignore | 1 | ||||
| -rw-r--r-- | units/console-shell.service.m4.in (renamed from units/console-shell.service.m4) | 2 | ||||
| -rw-r--r-- | units/emergency.service.in (renamed from units/emergency.service) | 2 | ||||
| -rw-r--r-- | units/rescue.service.m4.in (renamed from units/rescue.service.m4) | 2 | ||||
| -rw-r--r-- | units/systemd-ask-password-wall.service.in | 4 |
6 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 2b04142ea7..3cb50d854c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -338,6 +338,7 @@ nodist_systemunit_DATA = \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ units/halt.service \ + units/emergency.service \ units/poweroff.service \ units/reboot.service \ units/kexec.service \ @@ -359,8 +360,8 @@ nodist_userunit_DATA = \ EXTRA_DIST += \ units/getty@.service.m4 \ units/serial-getty@.service.m4 \ - units/console-shell.service.m4 \ - units/rescue.service.m4 \ + units/console-shell.service.m4.in \ + units/rescue.service.m4.in \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ units/systemd-modules-load.service.in \ @@ -372,6 +373,7 @@ EXTRA_DIST += \ units/systemd-ask-password-wall.service.in \ units/systemd-ask-password-console.service.in \ units/systemd-sysctl.service.in \ + units/emergency.service.in \ units/halt.service.in \ units/poweroff.service.in \ units/reboot.service.in \ diff --git a/units/.gitignore b/units/.gitignore index f3b3cef133..3cf64237a8 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -40,6 +40,7 @@ systemd-update-utmp-runlevel.service systemd-update-utmp-shutdown.service test-env-replace systemd-binfmt.service +emergency.service /udev-settle.service /udev-trigger.service /udev.service diff --git a/units/console-shell.service.m4 b/units/console-shell.service.m4.in index fef9e1b176..b0ced10aaa 100644 --- a/units/console-shell.service.m4 +++ b/units/console-shell.service.m4.in @@ -32,7 +32,7 @@ Before=getty.target Environment=HOME=/root WorkingDirectory=/root ExecStart=-/sbin/sulogin -ExecStopPost=-/bin/systemctl poweroff +ExecStopPost=-@SYSTEMCTL@ poweroff StandardInput=tty-force StandardOutput=inherit StandardError=inherit diff --git a/units/emergency.service b/units/emergency.service.in index 43a74d7a36..11ff472f6e 100644 --- a/units/emergency.service +++ b/units/emergency.service.in @@ -19,7 +19,7 @@ WorkingDirectory=/root ExecStartPre=-/bin/plymouth quit ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to enter default mode.' ExecStart=-/sbin/sulogin -ExecStopPost=/bin/systemctl --fail --no-block default +ExecStopPost=@SYSTEMCTL@ --fail --no-block default StandardInput=tty-force StandardOutput=inherit StandardError=inherit diff --git a/units/rescue.service.m4 b/units/rescue.service.m4.in index 310bbce1e6..df0b54fd60 100644 --- a/units/rescue.service.m4 +++ b/units/rescue.service.m4.in @@ -32,7 +32,7 @@ m4_ifdef(`TARGET_MEEGO', `EnvironmentFile=/etc/sysconfig/init ExecStart=-/bin/bash -c "exec ${SINGLE}"', `ExecStart=-/sbin/sulogin')))) -ExecStopPost=-/bin/systemctl --fail --no-block default +ExecStopPost=-@SYSTEMCTL@ --fail --no-block default StandardInput=tty-force StandardOutput=inherit StandardError=inherit diff --git a/units/systemd-ask-password-wall.service.in b/units/systemd-ask-password-wall.service.in index 71ec1d68f8..d8e27bf96b 100644 --- a/units/systemd-ask-password-wall.service.in +++ b/units/systemd-ask-password-wall.service.in @@ -10,6 +10,6 @@ Description=Forward Password Requests to Wall After=systemd-user-sessions.service [Service] -ExecStartPre=-@rootbindir@/systemctl stop systemd-ask-password-console.path systemd-ask-password-console.service -ExecStartPre=-@rootbindir@/systemctl stop systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service +ExecStartPre=-@SYSTEMCTL@ stop systemd-ask-password-console.path systemd-ask-password-console.service +ExecStartPre=-@SYSTEMCTL@ stop systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service ExecStart=@rootbindir@/systemd-tty-ask-password-agent --wall |