On Sat, Feb 18, 2012 at 05:15:04PM +0000, Debian Bug Tracking System wrote:
I've attached a further minor addition (again against current git) which obsoletes UTC= in /etc/default/rcS after we've migrated to /etc/adjtime. Since we're the only user of this value, it's most appropriate for this to be done in util-linux rather than initscripts, since I won't know in initscripts when the migration has happened. Regards, Roger -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' schroot and sbuild http://alioth.debian.org/projects/buildd-tools `- GPG Public Key F33D 281D 470A B443 6756 147C 07B3 C8BC 4083 E800
>From 1e69ec4148791b4368700a810e38ea493ec1a67a Mon Sep 17 00:00:00 2001 From: Roger Leigh <[email protected]> Date: Sat, 18 Feb 2012 17:38:49 +0000 Subject: [PATCH 2/2] debian: Obsolete UTC= in /etc/default/rcS --- debian/changelog | 2 ++ debian/util-linux.postinst | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index 072ef2d..ae563f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,8 @@ util-linux (2.20.1-2) unstable; urgency=low setting in /etc/default/rcS doesn't create problems by requiring two separate changes (changing the UTC setting and running hwclock) to do the same thing. + - Comment out the now-obsolete UTC= setting in /etc/default/rcS, + with a reference to /etc/adjtime and hwclock(8). - systemd uses /etc/adjtime as for hwclock to store the hardware clock UTC/LOCAL configuration. This change means there's a single place to store the hardware clock configuration for all diff --git a/debian/util-linux.postinst b/debian/util-linux.postinst index 931c03f..8c88465 100644 --- a/debian/util-linux.postinst +++ b/debian/util-linux.postinst @@ -44,6 +44,9 @@ if dpkg --compare-versions "$2" lt "2.20.1-2"; then else sed -i -e 's:^LOCAL$:UTC:' /etc/adjtime fi + if [ -f /etc/default/rcS ]; then + sed -i -e 's:^\(UTC=.*\)$:#\1 # OBSOLETE; see /etc/adjtime and hwclock(8).:' /etc/default/rcS + fi fi if [ -x /usr/sbin/update-mime ]; then -- 1.7.9
