Merge lp:~vorlon/ubiquity/lp.1184006 into lp:ubiquity

[Steve Langasek]

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

[Colin Watson (cjwatson)]

The same comments as I just left in https://code.launchpad.net/~vorlon/ubuntu/saucy/clock-setup/lp.1184006/+merge/172706 apply here, with the exception of the final one about the branch merge target.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

Is this still needed?

review: Needs Information

[Dimitri John Ledkov (xnox)]

The development of ubiquity has moved to git, still hosted on launchpad. If this merge proposal is still relevant, please resubmit it against the git branches found at https://code.launchpad.net/ubiquity

Sorry for any inconvenience caused.

review: Needs Resubmitting

Unmerged revisions

5950. 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-07-01 11:32:25 +0000
+++ debian/changelog	2013-07-03 00:29:28 +0000
@@ -1,7 +1,12 @@
 ubiquity (2.15.9) UNRELEASED; urgency=low
 
+  [ Dmitrijs Ledkovs ]
   * Use pyflakes3 instead of pyflakes, for better python3 checks.
 
+  [ Steve Langasek ]
+  * Store UTC settings in /etc/init/hwclock{,-save}.override, not in
+    /etc/default/rcS which is now a conffile.  LP: #1184006.
+
  -- Dmitrijs Ledkovs <[e-mail]>  Mon, 01 Jul 2013 12:31:25 +0100
 
 ubiquity (2.15.8) saucy; urgency=low

=== modified file 'scripts/clock-setup-apply'
--- scripts/clock-setup-apply	2012-05-21 14:58:53 +0000
+++ scripts/clock-setup-apply	2013-07-03 00:29:28 +0000
@@ -22,13 +22,13 @@
 db_get clock-setup/utc
 for root in $roots; do
 	if [ "$RET" = true ]; then
-		sed -i -e 's:^UTC="no":UTC="yes":' -e 's:^UTC=no:UTC=yes:' $root$utcfile
 		if [ -e "$root$adjtimefile" ]; then
 			sed -i -e 's:^LOCAL:UTC:' $root$adjtimefile
 		fi
 		UTC='--utc'
 	else
-		sed -i -e 's:^UTC="yes":UTC="no":' -e 's:^UTC=yes:UTC=no:' $root$utcfile
+		echo 'env UTC=no' > $root/etc/init/hwclock.override
+		echo 'env UTC=no' > $root/etc/init/hwclock-save.override
 		if [ -e "$root$adjtimefile" ]; then
 			sed -i -e 's:^UTC:LOCAL:' $root$adjtimefile
 		fi