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

Proposed by Steve Langasek
Status: Needs review
Proposed branch: lp://staging/~vorlon/ubuntu/saucy/clock-setup/lp.1184006
Merge into: lp://staging/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://staging/~vorlon/ubuntu/saucy/clock-setup/lp.1184006
Reviewer Review Type Date Requested Status
Colin Watson (community) Needs Fixing
Review via email: mp+172706@code.staging.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
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

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches