Merge lp:~vorlon/ubuntu/saucy/clock-setup/lp.1184006 into lp:ubuntu/saucy/clock-setup

[Steve Langasek]

clock-setup change for bug #1184006, related to
https://code.launchpad.net/~vorlon/ubuntu/saucy/sysvinit/lp.1184006/+merge/165722

[Colin Watson (cjwatson)]

I'm not sure this really addresses the comments I left in the sysvinit MP:

  We'll need to think about upload coordination. You have a version guard, but what about the overlap case with a daily build where an older installer installs a newer initscripts? That suggests to me that you shouldn't write to /etc/init/hwclock.override or /etc/init/hwclock-save.override if they already contain UTC settings; I think if we changed the installer first to handle either old or new, and then changed sysvinit with that refinement, then that would work.

So how about checking whether /etc/default/rcS contains UTC=.*, and if so assume that it should still be modified rather than hwclock*.override?

I also note that there's no default set for UTC in /etc/init/hwclock*.conf, and the test is [ "$UTC" = yes ]. Won't that mean an unset $UTC implies local time, which is not what's implemented here? Perhaps adding 'env UTC=yes' to /etc/init/hwclock*.conf would be appropriate.

Finally, we actually use lp:~ubuntu-core-dev/clock-setup/ubuntu rather than lp:ubuntu/clock-setup, and they don't share history; could you prepare a new branch based on that? Thanks.

review: Needs Fixing

Unmerged revisions

34. By Steve Langasek on 2013-07-03

Store UTC settings in /etc/init/hwclock{,-save}.override, not in
/etc/default/rcS which is now a conffile. LP: #1184006.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-05 11:49:59 +0000
+++ debian/changelog	2013-07-03 00:35:32 +0000
@@ -1,3 +1,10 @@
+clock-setup (0.115ubuntu2) UNRELEASED; urgency=low
+
+  * Store UTC settings in /etc/init/hwclock{,-save}.override, not in
+    /etc/default/rcS which is now a conffile.  LP: #1184006.
+
+ -- Steve Langasek <[e-mail]>  Tue, 02 Jul 2013 17:31:58 -0700
+
 clock-setup (0.115ubuntu1) saucy; urgency=low
 
   * Resynchronise with Debian.  Remaining changes:
 
=== modified file 'finish-install.d/10clock-setup'
--- finish-install.d/10clock-setup	2012-06-25 14:01:11 +0000
+++ finish-install.d/10clock-setup	2013-07-03 00:35:32 +0000
@@ -99,13 +99,13 @@
 
 db_get clock-setup/utc
 if [ "$RET" = true ]; then
-	sed -i -e 's:^UTC="no":UTC="yes":' -e 's:^UTC=no:UTC=yes:' $utcfile
 	if [ -e /target/etc/adjtime ]; then
 		sed -i -e 's:^LOCAL$:UTC:' /target/etc/adjtime
 	fi
 	OPT="--utc"
 else
-	sed -i -e 's:^UTC="yes":UTC="no":' -e 's:^UTC=yes:UTC=no:' $utcfile
+	echo 'env UTC=no' > /target/etc/init/hwclock.override
+	echo 'env UTC=no' > /target/etc/init/hwclock-save.override
 	if [ -e /target/etc/adjtime ]; then
 		sed -i -e 's:^UTC$:LOCAL:' /target/etc/adjtime
 	fi