From 835d81db939bf7a75fcf057462d71777ec475c21 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 18 May 2010 03:08:35 +0200 Subject: units: synchronize with shutdown.target --- units/fedora/killall.service | 1 + units/fedora/prefdm.service | 1 + units/fedora/rc-local.service | 1 + units/getty@.service.m4 | 1 + 4 files changed, 4 insertions(+) (limited to 'units') diff --git a/units/fedora/killall.service b/units/fedora/killall.service index 13bb564ad5..09781075bf 100644 --- a/units/fedora/killall.service +++ b/units/fedora/killall.service @@ -17,6 +17,7 @@ [Unit] Description=Kill All Processes +After=shutdown.target [Service] Type=finish diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service index 7df09ac84d..227ffbaad8 100644 --- a/units/fedora/prefdm.service +++ b/units/fedora/prefdm.service @@ -19,6 +19,7 @@ Description=Display Manager Before=graphical.target After=basic.target syslog.target messagebus.service haldaemon.service +Conflicts=shutdown.target [Service] ExecStart=/etc/X11/prefdm -nodaemon diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service index e8284a183a..30a2c8afbd 100644 --- a/units/fedora/rc-local.service +++ b/units/fedora/rc-local.service @@ -18,6 +18,7 @@ [Unit] Description=/etc/rc.local Compatibility Requires=basic.target +Conflicts=shutdown.target # The rcN.d symlink uses the name "local" while the script itself is # called "rc.local", hence carry both names here. diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index ffcc42aad9..890b4897a3 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -23,6 +23,7 @@ m4_dnl Description=Getty on %I Before=getty.target After=basic.target +Conflicts=shutdown.target [Service] Type=simple -- cgit v1.2.3-54-g00ecf