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.
This commit is contained in:
parent
9b1a953e08
commit
9cf2578683
|
@ -338,6 +338,7 @@ nodist_systemunit_DATA = \
|
||||||
units/systemd-ask-password-console.service \
|
units/systemd-ask-password-console.service \
|
||||||
units/systemd-sysctl.service \
|
units/systemd-sysctl.service \
|
||||||
units/halt.service \
|
units/halt.service \
|
||||||
|
units/emergency.service \
|
||||||
units/poweroff.service \
|
units/poweroff.service \
|
||||||
units/reboot.service \
|
units/reboot.service \
|
||||||
units/kexec.service \
|
units/kexec.service \
|
||||||
|
@ -359,8 +360,8 @@ nodist_userunit_DATA = \
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
units/getty@.service.m4 \
|
units/getty@.service.m4 \
|
||||||
units/serial-getty@.service.m4 \
|
units/serial-getty@.service.m4 \
|
||||||
units/console-shell.service.m4 \
|
units/console-shell.service.m4.in \
|
||||||
units/rescue.service.m4 \
|
units/rescue.service.m4.in \
|
||||||
units/systemd-initctl.service.in \
|
units/systemd-initctl.service.in \
|
||||||
units/systemd-shutdownd.service.in \
|
units/systemd-shutdownd.service.in \
|
||||||
units/systemd-modules-load.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-wall.service.in \
|
||||||
units/systemd-ask-password-console.service.in \
|
units/systemd-ask-password-console.service.in \
|
||||||
units/systemd-sysctl.service.in \
|
units/systemd-sysctl.service.in \
|
||||||
|
units/emergency.service.in \
|
||||||
units/halt.service.in \
|
units/halt.service.in \
|
||||||
units/poweroff.service.in \
|
units/poweroff.service.in \
|
||||||
units/reboot.service.in \
|
units/reboot.service.in \
|
||||||
|
|
1
units/.gitignore
vendored
1
units/.gitignore
vendored
|
@ -40,6 +40,7 @@ systemd-update-utmp-runlevel.service
|
||||||
systemd-update-utmp-shutdown.service
|
systemd-update-utmp-shutdown.service
|
||||||
test-env-replace
|
test-env-replace
|
||||||
systemd-binfmt.service
|
systemd-binfmt.service
|
||||||
|
emergency.service
|
||||||
/udev-settle.service
|
/udev-settle.service
|
||||||
/udev-trigger.service
|
/udev-trigger.service
|
||||||
/udev.service
|
/udev.service
|
||||||
|
|
|
@ -32,7 +32,7 @@ Before=getty.target
|
||||||
Environment=HOME=/root
|
Environment=HOME=/root
|
||||||
WorkingDirectory=/root
|
WorkingDirectory=/root
|
||||||
ExecStart=-/sbin/sulogin
|
ExecStart=-/sbin/sulogin
|
||||||
ExecStopPost=-/bin/systemctl poweroff
|
ExecStopPost=-@SYSTEMCTL@ poweroff
|
||||||
StandardInput=tty-force
|
StandardInput=tty-force
|
||||||
StandardOutput=inherit
|
StandardOutput=inherit
|
||||||
StandardError=inherit
|
StandardError=inherit
|
|
@ -19,7 +19,7 @@ WorkingDirectory=/root
|
||||||
ExecStartPre=-/bin/plymouth quit
|
ExecStartPre=-/bin/plymouth quit
|
||||||
ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to enter default mode.'
|
ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to enter default mode.'
|
||||||
ExecStart=-/sbin/sulogin
|
ExecStart=-/sbin/sulogin
|
||||||
ExecStopPost=/bin/systemctl --fail --no-block default
|
ExecStopPost=@SYSTEMCTL@ --fail --no-block default
|
||||||
StandardInput=tty-force
|
StandardInput=tty-force
|
||||||
StandardOutput=inherit
|
StandardOutput=inherit
|
||||||
StandardError=inherit
|
StandardError=inherit
|
|
@ -32,7 +32,7 @@ m4_ifdef(`TARGET_MEEGO',
|
||||||
`EnvironmentFile=/etc/sysconfig/init
|
`EnvironmentFile=/etc/sysconfig/init
|
||||||
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
|
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
|
||||||
`ExecStart=-/sbin/sulogin'))))
|
`ExecStart=-/sbin/sulogin'))))
|
||||||
ExecStopPost=-/bin/systemctl --fail --no-block default
|
ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
|
||||||
StandardInput=tty-force
|
StandardInput=tty-force
|
||||||
StandardOutput=inherit
|
StandardOutput=inherit
|
||||||
StandardError=inherit
|
StandardError=inherit
|
|
@ -10,6 +10,6 @@ Description=Forward Password Requests to Wall
|
||||||
After=systemd-user-sessions.service
|
After=systemd-user-sessions.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStartPre=-@rootbindir@/systemctl stop systemd-ask-password-console.path systemd-ask-password-console.service
|
ExecStartPre=-@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-plymouth.path systemd-ask-password-plymouth.service
|
||||||
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --wall
|
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --wall
|
||||||
|
|
Loading…
Reference in a new issue