From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Sep 2010 13:01:31 +0000 (+0200)
Subject: units: make sure we always fully write the utmp data
X-Git-Tag: v10~35
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d3f929f0fcbbb6e4752243b07222760431789249;ds=inline

units: make sure we always fully write the utmp data
---

diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index a288d6eb2..724e4a4c3 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 e071285e3..2042b71cb 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