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

Proposed by Steve Langasek on 2013-07-03
Status: Needs review
Proposed branch: lp:~vorlon/ubuntu/saucy/clock-setup/lp.1184006
Merge into: lp:ubuntu/saucy/clock-setup
Diff against target: 34 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
finish-install.d/10clock-setup (+2/-2)
To merge this branch: bzr merge lp:~vorlon/ubuntu/saucy/clock-setup/lp.1184006
Reviewer Review Type Date Requested Status
Colin Watson 2013-07-03 Needs Fixing on 2013-07-17
Review via email: mp+172706@code.launchpad.net

Description of the change

To post a comment you must log in.
Colin Watson (cjwatson) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-05 11:49:59 +0000
3+++ debian/changelog 2013-07-03 00:35:32 +0000
4@@ -1,3 +1,10 @@
5+clock-setup (0.115ubuntu2) UNRELEASED; urgency=low
6+
7+ * Store UTC settings in /etc/init/hwclock{,-save}.override, not in
8+ /etc/default/rcS which is now a conffile. LP: #1184006.
9+
10+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 02 Jul 2013 17:31:58 -0700
11+
12 clock-setup (0.115ubuntu1) saucy; urgency=low
13
14 * Resynchronise with Debian. Remaining changes:
15
16=== modified file 'finish-install.d/10clock-setup'
17--- finish-install.d/10clock-setup 2012-06-25 14:01:11 +0000
18+++ finish-install.d/10clock-setup 2013-07-03 00:35:32 +0000
19@@ -99,13 +99,13 @@
20
21 db_get clock-setup/utc
22 if [ "$RET" = true ]; then
23- sed -i -e 's:^UTC="no":UTC="yes":' -e 's:^UTC=no:UTC=yes:' $utcfile
24 if [ -e /target/etc/adjtime ]; then
25 sed -i -e 's:^LOCAL$:UTC:' /target/etc/adjtime
26 fi
27 OPT="--utc"
28 else
29- sed -i -e 's:^UTC="yes":UTC="no":' -e 's:^UTC=yes:UTC=no:' $utcfile
30+ echo 'env UTC=no' > /target/etc/init/hwclock.override
31+ echo 'env UTC=no' > /target/etc/init/hwclock-save.override
32 if [ -e /target/etc/adjtime ]; then
33 sed -i -e 's:^UTC$:LOCAL:' /target/etc/adjtime
34 fi

Subscribers

People subscribed via source and target branches