diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-12 23:49:20 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-12 23:49:20 +0200 |
| commit | f057408c9c3b54b6eeb96cd9f0a1333f30610614 (patch) | |
| tree | 3e3b4ba0a2718333350891c967b8096160514893 /units/fedora | |
| parent | 2edd4434e5bc6e5c7948df742d82f4bcd6c415f3 (diff) | |
units: introduce emergency.target
Diffstat (limited to 'units/fedora')
| -rw-r--r-- | units/fedora/halt.service | 6 | ||||
| -rw-r--r-- | units/fedora/poweroff.service | 6 | ||||
| -rw-r--r-- | units/fedora/reboot.service | 6 | ||||
| -rw-r--r-- | units/fedora/sysinit.service | 4 |
4 files changed, 10 insertions, 12 deletions
diff --git a/units/fedora/halt.service b/units/fedora/halt.service index b957a3fe30..4fe0d532f6 100644 --- a/units/fedora/halt.service +++ b/units/fedora/halt.service @@ -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 diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service index 76d030c041..3a53875707 100644 --- a/units/fedora/poweroff.service +++ b/units/fedora/poweroff.service @@ -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 diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service index 6a93c0b557..0f3e206eb0 100644 --- a/units/fedora/reboot.service +++ b/units/fedora/reboot.service @@ -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 diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service index 884de8d1d6..21872e8d8a 100644 --- a/units/fedora/sysinit.service +++ b/units/fedora/sysinit.service @@ -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 |