Commit f057408c authored by Lennart Poettering's avatar Lennart Poettering
Browse files

units: introduce emergency.target

parent 2edd4434
......@@ -113,6 +113,7 @@ dbusinterface_DATA = \
dist_systemunit_DATA = \
units/emergency.service \
units/emergency.target \
units/basic.target \
units/getty.target \
units/halt.target \
......@@ -183,7 +184,8 @@ dist_systemunit_DATA += \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/reboot.service \
units/fedora/sysinit.service
units/fedora/sysinit.service \
units/fedora/single.service
endif
if TARGET_SUSE
......@@ -755,7 +757,8 @@ install-data-hook:
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
if TARGET_FEDORA
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
$(DESTDIR)$(systemunitdir)/rescue.target.wants
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
......@@ -765,6 +768,9 @@ if TARGET_FEDORA
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f rc-local.service && \
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
rm -f single.service && \
$(LN_S) $(systemunitdir)/single.service single.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
......
......@@ -501,7 +501,7 @@
<listitem><para>Enter emergency
mode. This is mostly equivalent to
<command>isolate
emergency.service</command> but also
emergency.target</command> but also
prints a wall message to all
users.</para></listitem>
</varlistentry>
......
......@@ -54,7 +54,7 @@
<filename>dbus.target</filename>,
<filename>default.target</filename>,
<filename>display-manager.service</filename>,
<filename>emergency.service</filename>,
<filename>emergency.target</filename>,
<filename>exit.service</filename>,
<filename>graphical.target</filename>,
<filename>halt.target</filename>,
......@@ -205,9 +205,9 @@
</listitem>
</varlistentry>
<varlistentry>
<term><filename>emergency.service</filename></term>
<term><filename>emergency.target</filename></term>
<listitem>
<para>A special service unit
<para>A special target unit
that starts an emergency
shell on the main
console. This unit is supposed
......
......@@ -1947,7 +1947,7 @@ static int manager_process_signal_fd(Manager *m) {
static const char * const table[] = {
[0] = SPECIAL_DEFAULT_TARGET,
[1] = SPECIAL_RESCUE_TARGET,
[2] = SPECIAL_EMERGENCY_SERVICE,
[2] = SPECIAL_EMERGENCY_TARGET,
[3] = SPECIAL_HALT_TARGET,
[4] = SPECIAL_POWEROFF_TARGET,
[5] = SPECIAL_REBOOT_TARGET
......
......@@ -53,7 +53,7 @@
#define SPECIAL_SYSINIT_TARGET "sysinit.target"
#define SPECIAL_RESCUE_TARGET "rescue.target"
#define SPECIAL_EXIT_SERVICE "exit.service"
#define SPECIAL_EMERGENCY_SERVICE "emergency.service"
#define SPECIAL_EMERGENCY_TARGET "emergency.target"
#define SPECIAL_HALT_TARGET "halt.target"
#define SPECIAL_POWEROFF_TARGET "poweroff.target"
#define SPECIAL_REBOOT_TARGET "reboot.target"
......
......@@ -720,7 +720,7 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) {
[ACTION_RUNLEVEL4] = SPECIAL_RUNLEVEL4_TARGET,
[ACTION_RUNLEVEL5] = SPECIAL_RUNLEVEL5_TARGET,
[ACTION_RESCUE] = SPECIAL_RESCUE_TARGET,
[ACTION_EMERGENCY] = SPECIAL_EMERGENCY_SERVICE,
[ACTION_EMERGENCY] = SPECIAL_EMERGENCY_TARGET,
[ACTION_DEFAULT] = SPECIAL_DEFAULT_TARGET
};
......
......@@ -10,16 +10,17 @@
[Unit]
Description=Emergency Shell
DefaultDependencies=no
Requires=shutdown.target umount.target
After=shutdown.target umount.target
After=shutdown.target
[Service]
ExecStartPre=-/bin/plymouth --hide-splash
ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
ExecStart=/bin/sh
StandardInput=tty
StandardInput=tty-force
Restart=restart-always
RestartSec=0
KillMode=process-group
# Bash ignores SIGTERM, so we send SIGHUP first, to ensure that bash
# terminates cleanly.
ExecStop=/bin/kill -HUP $(MAINPID)
ExecStop=-/bin/kill -HUP $(MAINPID)
......@@ -8,9 +8,9 @@
[Unit]
Description=Halt
DefaultDependencies=no
Requires=shutdown.target killall.service
After=shutdown.target killall.service
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
Requires=shutdown.target umount.target killall.service
Conflicts=sysinit.service
After=shutdown.target umount.target killall.service sysinit.service
[Service]
Type=finish
......
......@@ -8,9 +8,9 @@
[Unit]
Description=Power-Off
DefaultDependencies=no
Requires=shutdown.target killall.service
After=shutdown.target killall.service
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
Requires=shutdown.target umount.target killall.service
Conflicts=sysinit.service
After=shutdown.target umount.target killall.service sysinit.service
[Service]
Type=finish
......
......@@ -8,9 +8,9 @@
[Unit]
Description=Reboot
DefaultDependencies=no
Requires=shutdown.target killall.service
After=shutdown.target killall.service
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
Requires=shutdown.target umount.target killall.service
Conflicts=sysinit.service
After=shutdown.target umount.target killall.service sysinit.service
[Service]
Type=finish
......
......@@ -8,9 +8,7 @@
[Unit]
Description=System Initialization
DefaultDependencies=no
Before=local-fs.target remote-fs.target swap.target sockets.target
Conflicts=shutdown.target
Before=shutdown.target
Before=emergency.service emergency.target
[Service]
ExecStart=/etc/rc.d/rc.sysinit
......
......@@ -10,8 +10,8 @@
[Unit]
Description=Multi-User
Requires=basic.target
After=basic.target
Conflicts=rescue.target
Conflicts=rescue.target shutdown.target
After=basic.target rescue.target
m4_dnl
m4_ifdef(`TARGET_FEDORA',
m4_dnl On Fedora Runlevel 3 is multi-user
......
......@@ -8,9 +8,10 @@
# See systemd.special(7) for details
[Unit]
Description=Rescue Prompt
Requires=basic.target
After=basic.target
Description=Rescue Mode
Requires=sysinit.target local-fs.target swap.target shutdown.target
Conflicts=emergency.service emergency.target
After=sysinit.target local-fs.target swap.target shutdown.target emergency.service emergency.target
Names=runlevel1.target
[Install]
......
......@@ -9,7 +9,8 @@
[Unit]
Description=Systemd Initialization
Conflicts=emergency.service
Conflicts=emergency.service emergency.target
After=emergency.service emergency.target
OnlyByDependency=yes
m4_dnl
m4_ifdef(`TARGET_FEDORA',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment