summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-09-06 15:01:31 +0200
committerLennart Poettering <lennart@poettering.net>2010-09-06 15:01:57 +0200
commitd3f929f0fcbbb6e4752243b07222760431789249 (patch)
treefc8031639b589820d9296fbf70976fcb06eee2cb
parent96d4ce01103ebebe9335fb321667043bb620c06b (diff)
units: make sure we always fully write the utmp data
-rw-r--r--units/systemd-update-utmp-runlevel.service.in3
-rw-r--r--units/systemd-update-utmp-shutdown.service.in2
2 files changed, 2 insertions, 3 deletions
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index a288d6eb21..724e4a4c3a 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -8,9 +8,8 @@
[Unit]
Description=Notify Audit System and Update UTMP about System Runlevel Changes
DefaultDependencies=no
+Before=poweroff.service reboot.service halt.service killall.service
After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target auditd.service
-Conflicts=shutdown.target
-Before=shutdown.target
[Service]
Type=oneshot
diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
index e071285e3a..2042b71cb7 100644
--- a/units/systemd-update-utmp-shutdown.service.in
+++ b/units/systemd-update-utmp-shutdown.service.in
@@ -9,7 +9,7 @@
Description=Notify Audit System and Update UTMP about System Shutdown
DefaultDependencies=no
Before=poweroff.service reboot.service halt.service killall.service
-Conflicts=systemd-update-utmp-runlevel.service
+After=systemd-update-utmp-runlevel.service
[Service]
Type=oneshot