Merge lp:~vorlon/ubuntu/saucy/sysvinit/lp.1184006 into lp:ubuntu/saucy/sysvinit

[Steve Langasek]

Colin, can you review this to see if it seems sane to you?

It's possible there needs to be a corresponding change to the installer -
dunno if we expose the option to set UTC=no nowadays.

[lp:~vorlon/ubuntu/saucy/sysvinit/lp.1184006]

191. By Steve Langasek on 2013-05-28

Merge from trunk, and adjust the version check in the preinst to account for
an intervening upload

[Colin Watson (cjwatson)]

The general approach more or less makes sense to me, but a few things:

 * Yes, we'll need corresponding changes to the installer; unfortunately
   this is one of the things that's duplicated between d-i and ubiquity,
   so changes need to be in both clock-setup and ubiquity.

 * 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.

 * I don't quite understand what "sed -i -e's/^UTC=.*/UTC=yes/'
   /etc/default/rcS" is for. Is that so that dpkg conffile replacement
   works? Would it be better to forcibly remove the option in the
   postinst, instead or perhaps as well? Editing conffiles is of course
   always a bit scary, so I suppose go with whatever approach
   initscripts has historically taken here ...

[Steve Langasek (vorlon)]

On Fri, May 31, 2013 at 06:16:26PM -0000, Colin Watson wrote:
> The general approach more or less makes sense to me, but a few things:

> * Yes, we'll need corresponding changes to the installer; unfortunately
> this is one of the things that's duplicated between d-i and ubiquity,
> so changes need to be in both clock-setup and ubiquity.

> * 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.

Ok. Should I prepare the changes to clock-setup and ubiquity?

> * I don't quite understand what "sed -i -e's/^UTC=.*/UTC=yes/'
> /etc/default/rcS" is for. Is that so that dpkg conffile replacement
> works? Would it be better to forcibly remove the option in the
> postinst, instead or perhaps as well? Editing conffiles is of course
> always a bit scary, so I suppose go with whatever approach
> initscripts has historically taken here ...

This is to suppress the wrong conffile replacement prompt, yes, by ensuring
that the copy of the file on disk doesn't have any spurious delta caused by
the UTC setting that we're moving out of the way. I'm confident that this
part of the code is doing the right thing, neither incorrectly losing any
user preferences nor mangling the file in a way that will *cause* conffile
prompts incorrectly on upgrade. (This is a sed to UTC=yes, rather than a
removal, because that ensures it matches the interim version of the conffile
as shipped in the package currently in saucy, giving the correct results for
both pre-saucy and saucy upgrades.)

[Colin Watson (cjwatson)]

On Fri, May 31, 2013 at 06:28:28PM -0000, Steve Langasek wrote:
> Ok. Should I prepare the changes to clock-setup and ubiquity?

If you could, that would be great. Obviously if you don't have time
then let me know.

> > * I don't quite understand what "sed -i -e's/^UTC=.*/UTC=yes/'
> > /etc/default/rcS" is for. Is that so that dpkg conffile replacement
> > works? Would it be better to forcibly remove the option in the
> > postinst, instead or perhaps as well? Editing conffiles is of course
> > always a bit scary, so I suppose go with whatever approach
> > initscripts has historically taken here ...
>
> This is to suppress the wrong conffile replacement prompt, yes, by ensuring
> that the copy of the file on disk doesn't have any spurious delta caused by
> the UTC setting that we're moving out of the way. I'm confident that this
> part of the code is doing the right thing, neither incorrectly losing any
> user preferences nor mangling the file in a way that will *cause* conffile
> prompts incorrectly on upgrade. (This is a sed to UTC=yes, rather than a
> removal, because that ensures it matches the interim version of the conffile
> as shipped in the package currently in saucy, giving the correct results for
> both pre-saucy and saucy upgrades.)

OK. Most things relating to conffile mangling in maintainer scripts
still give me the shivers, but this seems reasonable enough.

Unmerged revisions

191. By Steve Langasek on 2013-05-28

Merge from trunk, and adjust the version check in the preinst to account for
an intervening upload

190. By Steve Langasek on 2013-05-24

Move the UTC setting out of /etc/default/rcS, which is now a conffile,
to /etc/init/hwclock{,-save}.override. LP: #1184006.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-28 19:23:46 +0000
+++ debian/changelog	2013-05-28 19:58:43 +0000
@@ -1,3 +1,10 @@
+sysvinit (2.88dsf-41ubuntu3) UNRELEASED; urgency=low
+
+  * Move the UTC setting out of /etc/default/rcS, which is now a conffile,
+    to /etc/init/hwclock{,-save}.override.  LP: #1184006.
+
+ -- Steve Langasek <[e-mail]>  Fri, 24 May 2013 16:39:58 -0700
+
 sysvinit (2.88dsf-41ubuntu2) saucy; urgency=low
 
   * debian/src/sysv-rc/sbin/invoke-rc.d: tweak behavior of invoke-rc.d when

=== modified file 'debian/initscripts.preinst'
--- debian/initscripts.preinst	2013-05-17 19:02:36 +0000
+++ debian/initscripts.preinst	2013-05-28 19:58:43 +0000
@@ -60,6 +60,16 @@
 	if [ "$2" ] && dpkg --compare-versions "$2" lt "2.88dsf-23" ; then
 		eliminate_conffile "/etc/init.d/mountoverflowtmp"
 	fi
+
+	if dpkg --compare-versions "$2" lt-nl 2.88dsf-41ubuntu3; then
+		UTC=yes
+		. /etc/default/rcS
+		if [ "$UTC" != yes ]; then
+			echo "env UTC=\"$UTC\"" >> /etc/init/hwclock.override
+			echo "env UTC=\"$UTC\"" >> /etc/init/hwclock-save.override
+		fi
+		sed -i -e's/^UTC=.*/UTC=yes/' /etc/default/rcS
+	fi
 	# rcS was made a conffile in removed in 2.88dsf-26.  Replace
 	# unmodified older versions, including automated commenting of
 	# removed variables.

=== modified file 'debian/src/initscripts/etc/default/rcS'
--- debian/src/initscripts/etc/default/rcS	2013-05-17 06:03:10 +0000
+++ debian/src/initscripts/etc/default/rcS	2013-05-28 19:58:43 +0000
@@ -17,9 +17,6 @@
 # do not allow users to log in until the boot has completed
 #DELAYLOGIN=no
 
-# assume that the BIOS clock is set to UTC time (recommended)
-UTC=yes
-
 # be more verbose during the boot process
 #VERBOSE=no