From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 25 May 2011 16:21:36 +0000 (+0200)
Subject: drop hwclock-save.service
X-Git-Tag: v28~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=da2617378523e007ec0c6efe99d0cebb2be994e1;p=elogind.git

drop hwclock-save.service

We don't want to fiddle around changing the RTC, not on bootup, not
on shutdown.

If we don't run NTP, we have absolutely no clue what's the current
time to store in the RTC. If we run NTP, the kernel syncs the system
time every 11 minutes to the RTC.

Especially in multi-boot environents we must not call hwclock(8)
which tries to be smart with calculating/storing/applying drifts
and such.

Live-CDs must never touch the RTC, because we don't know if it is
running in UTC or locatime.
---

diff --git a/Makefile.am b/Makefile.am
index 1fc91639c..ee16f9800 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -274,7 +274,6 @@ dist_systemunit_DATA = \
 	units/sys-kernel-security.mount \
 	units/var-run.mount \
 	units/media.mount \
-	units/hwclock-save.service \
 	units/remount-rootfs.service \
 	units/printer.target \
 	units/sound.target \
@@ -1374,10 +1373,8 @@ endif
 		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
 	( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
 		rm -f systemd-update-utmp-shutdown.service \
-			hwclock-save.service \
 			systemd-random-seed-save.service && \
 		$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \
-		$(LN_S) ../hwclock-save.service hwclock-save.service && \
 		$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
 		rm -f systemd-remount-api-vfs.service \
diff --git a/units/hwclock-save.service b/units/hwclock-save.service
deleted file mode 100644
index dedee767a..000000000
--- a/units/hwclock-save.service
+++ /dev/null
@@ -1,17 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Update RTC With System Clock
-DefaultDependencies=no
-After=hwclock-load.service
-Before=shutdown.target
-Conflicts=hwclock-load.service
-
-[Service]
-Type=oneshot
-ExecStart=/sbin/hwclock --systohc