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

Proposed by Steve Langasek on 2013-07-03
Status: Work in progress
Proposed branch: lp:~vorlon/ubiquity/lp.1184006
Merge into: lp:ubiquity
Diff against target: 36 lines (+7/-2)
2 files modified
debian/changelog (+5/-0)
scripts/clock-setup-apply (+2/-2)
To merge this branch: bzr merge lp:~vorlon/ubiquity/lp.1184006
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Resubmit on 2018-05-29
Colin Watson 2013-07-03 Needs Fixing on 2013-07-17
Review via email: mp+172703@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) wrote :

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) wrote :

Is this still needed?

review: Needs Information
Dimitri John Ledkov (xnox) wrote :

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: Resubmit

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.

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-07-01 11:32:25 +0000
3+++ debian/changelog 2013-07-03 00:29:28 +0000
4@@ -1,7 +1,12 @@
5 ubiquity (2.15.9) UNRELEASED; urgency=low
6
7+ [ Dmitrijs Ledkovs ]
8 * Use pyflakes3 instead of pyflakes, for better python3 checks.
9
10+ [ Steve Langasek ]
11+ * Store UTC settings in /etc/init/hwclock{,-save}.override, not in
12+ /etc/default/rcS which is now a conffile. LP: #1184006.
13+
14 -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Mon, 01 Jul 2013 12:31:25 +0100
15
16 ubiquity (2.15.8) saucy; urgency=low
17
18=== modified file 'scripts/clock-setup-apply'
19--- scripts/clock-setup-apply 2012-05-21 14:58:53 +0000
20+++ scripts/clock-setup-apply 2013-07-03 00:29:28 +0000
21@@ -22,13 +22,13 @@
22 db_get clock-setup/utc
23 for root in $roots; do
24 if [ "$RET" = true ]; then
25- sed -i -e 's:^UTC="no":UTC="yes":' -e 's:^UTC=no:UTC=yes:' $root$utcfile
26 if [ -e "$root$adjtimefile" ]; then
27 sed -i -e 's:^LOCAL:UTC:' $root$adjtimefile
28 fi
29 UTC='--utc'
30 else
31- sed -i -e 's:^UTC="yes":UTC="no":' -e 's:^UTC=yes:UTC=no:' $root$utcfile
32+ echo 'env UTC=no' > $root/etc/init/hwclock.override
33+ echo 'env UTC=no' > $root/etc/init/hwclock-save.override
34 if [ -e "$root$adjtimefile" ]; then
35 sed -i -e 's:^UTC:LOCAL:' $root$adjtimefile
36 fi

Subscribers

People subscribed via source and target branches

to status/vote changes: