From 9cf2578683de834026f501c24a0f5d3d0991d0a6 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 4 Apr 2012 00:22:21 -0400 Subject: 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. --- Makefile.am | 6 ++-- units/.gitignore | 1 + units/console-shell.service.m4 | 47 ------------------------------ units/console-shell.service.m4.in | 47 ++++++++++++++++++++++++++++++ units/emergency.service | 31 -------------------- units/emergency.service.in | 31 ++++++++++++++++++++ units/rescue.service.m4 | 43 --------------------------- units/rescue.service.m4.in | 43 +++++++++++++++++++++++++++ units/systemd-ask-password-wall.service.in | 4 +-- 9 files changed, 128 insertions(+), 125 deletions(-) delete mode 100644 units/console-shell.service.m4 create mode 100644 units/console-shell.service.m4.in delete mode 100644 units/emergency.service create mode 100644 units/emergency.service.in delete mode 100644 units/rescue.service.m4 create mode 100644 units/rescue.service.m4.in 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 deleted file mode 100644 index fef9e1b176..0000000000 --- a/units/console-shell.service.m4 +++ /dev/null @@ -1,47 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -[Unit] -Description=Console Shell -After=systemd-user-sessions.service plymouth-quit-wait.service -m4_ifdef(`TARGET_FEDORA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_ARCH', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_FRUGALWARE', -After=local.service -)m4_dnl -m4_ifdef(`TARGET_ALTLINUX', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MANDRIVA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MAGEIA', -After=rc-local.service -)m4_dnl -Before=getty.target - -[Service] -Environment=HOME=/root -WorkingDirectory=/root -ExecStart=-/sbin/sulogin -ExecStopPost=-/bin/systemctl poweroff -StandardInput=tty-force -StandardOutput=inherit -StandardError=inherit -KillMode=process -IgnoreSIGPIPE=no - -# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash -# terminates cleanly. -KillSignal=SIGHUP - -[Install] -WantedBy=getty.target diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in new file mode 100644 index 0000000000..b0ced10aaa --- /dev/null +++ b/units/console-shell.service.m4.in @@ -0,0 +1,47 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Console Shell +After=systemd-user-sessions.service plymouth-quit-wait.service +m4_ifdef(`TARGET_FEDORA', +After=rc-local.service +)m4_dnl +m4_ifdef(`TARGET_ARCH', +After=rc-local.service +)m4_dnl +m4_ifdef(`TARGET_FRUGALWARE', +After=local.service +)m4_dnl +m4_ifdef(`TARGET_ALTLINUX', +After=rc-local.service +)m4_dnl +m4_ifdef(`TARGET_MANDRIVA', +After=rc-local.service +)m4_dnl +m4_ifdef(`TARGET_MAGEIA', +After=rc-local.service +)m4_dnl +Before=getty.target + +[Service] +Environment=HOME=/root +WorkingDirectory=/root +ExecStart=-/sbin/sulogin +ExecStopPost=-@SYSTEMCTL@ poweroff +StandardInput=tty-force +StandardOutput=inherit +StandardError=inherit +KillMode=process +IgnoreSIGPIPE=no + +# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash +# terminates cleanly. +KillSignal=SIGHUP + +[Install] +WantedBy=getty.target diff --git a/units/emergency.service b/units/emergency.service deleted file mode 100644 index 43a74d7a36..0000000000 --- a/units/emergency.service +++ /dev/null @@ -1,31 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Emergency Shell -DefaultDependencies=no -Conflicts=shutdown.target -Before=shutdown.target - -[Service] -Environment=HOME=/root -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 -StandardInput=tty-force -StandardOutput=inherit -StandardError=inherit -KillMode=process -IgnoreSIGPIPE=no - -# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash -# terminates cleanly. -KillSignal=SIGHUP diff --git a/units/emergency.service.in b/units/emergency.service.in new file mode 100644 index 0000000000..11ff472f6e --- /dev/null +++ b/units/emergency.service.in @@ -0,0 +1,31 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Emergency Shell +DefaultDependencies=no +Conflicts=shutdown.target +Before=shutdown.target + +[Service] +Environment=HOME=/root +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=@SYSTEMCTL@ --fail --no-block default +StandardInput=tty-force +StandardOutput=inherit +StandardError=inherit +KillMode=process +IgnoreSIGPIPE=no + +# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash +# terminates cleanly. +KillSignal=SIGHUP diff --git a/units/rescue.service.m4 b/units/rescue.service.m4 deleted file mode 100644 index 310bbce1e6..0000000000 --- a/units/rescue.service.m4 +++ /dev/null @@ -1,43 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Rescue Shell -DefaultDependencies=no -Conflicts=shutdown.target -After=basic.target plymouth-start.service -Before=shutdown.target - -[Service] -Environment=HOME=/root -WorkingDirectory=/root -ExecStartPre=-/bin/plymouth quit -ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.' -m4_ifdef(`TARGET_FEDORA', -`EnvironmentFile=/etc/sysconfig/init -ExecStart=-/bin/bash -c "exec ${SINGLE}"', -m4_ifdef(`TARGET_MANDRIVA', -`EnvironmentFile=/etc/sysconfig/init -ExecStart=-/bin/bash -c "exec ${SINGLE}"', -m4_ifdef(`TARGET_MAGEIA', -`EnvironmentFile=/etc/sysconfig/init -ExecStart=-/bin/bash -c "exec ${SINGLE}"', -m4_ifdef(`TARGET_MEEGO', -`EnvironmentFile=/etc/sysconfig/init -ExecStart=-/bin/bash -c "exec ${SINGLE}"', -`ExecStart=-/sbin/sulogin')))) -ExecStopPost=-/bin/systemctl --fail --no-block default -StandardInput=tty-force -StandardOutput=inherit -StandardError=inherit -KillMode=process - -# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash -# terminates cleanly. -KillSignal=SIGHUP diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in new file mode 100644 index 0000000000..df0b54fd60 --- /dev/null +++ b/units/rescue.service.m4.in @@ -0,0 +1,43 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Rescue Shell +DefaultDependencies=no +Conflicts=shutdown.target +After=basic.target plymouth-start.service +Before=shutdown.target + +[Service] +Environment=HOME=/root +WorkingDirectory=/root +ExecStartPre=-/bin/plymouth quit +ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.' +m4_ifdef(`TARGET_FEDORA', +`EnvironmentFile=/etc/sysconfig/init +ExecStart=-/bin/bash -c "exec ${SINGLE}"', +m4_ifdef(`TARGET_MANDRIVA', +`EnvironmentFile=/etc/sysconfig/init +ExecStart=-/bin/bash -c "exec ${SINGLE}"', +m4_ifdef(`TARGET_MAGEIA', +`EnvironmentFile=/etc/sysconfig/init +ExecStart=-/bin/bash -c "exec ${SINGLE}"', +m4_ifdef(`TARGET_MEEGO', +`EnvironmentFile=/etc/sysconfig/init +ExecStart=-/bin/bash -c "exec ${SINGLE}"', +`ExecStart=-/sbin/sulogin')))) +ExecStopPost=-@SYSTEMCTL@ --fail --no-block default +StandardInput=tty-force +StandardOutput=inherit +StandardError=inherit +KillMode=process + +# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash +# terminates cleanly. +KillSignal=SIGHUP 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 -- cgit v1.2.3-54-g00ecf