Merge lp:~daniel-thewatkins/livecd-rootfs/enable-backports into lp:livecd-rootfs

Proposed by Dan Watkins on 2016-05-18
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp:~daniel-thewatkins/livecd-rootfs/enable-backports
Merge into: lp:livecd-rootfs
Diff against target: 199 lines (+44/-103) (has conflicts)
2 files modified
debian/changelog (+11/-0)
live-build/auto/build (+33/-103)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~daniel-thewatkins/livecd-rootfs/enable-backports
Reviewer Review Type Date Requested Status
Steve Langasek Needs Fixing on 2016-06-07
Adam Conrad 2016-05-18 Needs Fixing on 2016-05-20
Review via email: mp+295059@code.launchpad.net
To post a comment you must log in.
Adam Conrad (adconrad) wrote :

Generally okay, but please have a look at what a current desktop and server ISO do for default sources.list, and adjust the icky auto/build function to do the same thing. If we now enable the world by default, let's just do that and stop detecting based on the components we built with.

review: Needs Fixing
Adam Conrad (adconrad) wrote :

(When I say "look at what they do", I don't mean "read and duplicate the code", but rather just do a quick desktop install and server install in VMs and look at the final product. Ideally, all the sources.lists should look the same, but if they don't, let's identify divergence and fix that)

1390. By Dan Watkins on 2016-05-20

[CPC] Don't overwrite the default sources.list

We've received a request not to do so (LP: #1513529) and cloud-init applies it
(or something similar to it) at boot anyway, so the list we're putting in place
isn't generally used.

Oliver Grawert (ogra) wrote :

do we actually enable backports in official server and desktop images now ? is that a recent change in xenial ? (we never did before)

Adam Conrad (adconrad) wrote :

I see your idea of "recent" is about as messed up as mine is, ogra. ;)

apt-setup (1:0.49ubuntu5) oneiric; urgency=low

  * Enable backports by default now that we have NotAutomatic enabled and
    working.

 -- Iain Lane <email address hidden> Thu, 12 May 2011 08:39:39 +0100

Steve Langasek (vorlon) wrote :

Sorry for the delay in re-reviewing this. Even more sorry to say I've found at least one regression wrt the contents of the default sources.list (see inline below).

review: Needs Fixing
Steve Langasek (vorlon) wrote :

FWIW I know it would be straightforward for me to fix the one bug I identified as part of the merge - but please cross-check your output with the default desktop sources.list, since apparently the default server sources.list is buggy.

Dan Watkins (daniel-thewatkins) wrote :

http://paste.ubuntu.com/17112219/ is what I have on a fresh Xenial server install; so the bug does exist there.

http://paste.ubuntu.com/17112222/ is what I have on my desktop (which was a trusty install originally); that looks correct to me. I'll modify the wording in my proposal to use that.

(Commenting up here so my new revision doesn't swallow the diff comment)

Dan Watkins (daniel-thewatkins) wrote :

Someone in #ubuntu gave me http://paste.ubuntu.com/17112254/ as a sources.list from a fresh xenial desktop install; it looks like the issue exists on desktop too.

1391. By Dan Watkins on 2016-06-08

Replace sources.list generated using COMPONENTS with the sources.list from
an Ubuntu Server installation (i.e. with all components enabled, and all
deb-src lines commented).

1392. By Dan Watkins on 2016-06-08

Use the correct (pre-xenial) universe sources.list comment

1393. By Dan Watkins on 2016-06-08

Remove some trailing spaces

Dan Watkins (daniel-thewatkins) wrote :

I've filed https://bugs.launchpad.net/ubuntu/+source/apt-setup/+bug/1590358; I believe apt-setup creates the installed sources.list files.

Steve Langasek (vorlon) wrote :

On Wed, Jun 08, 2016 at 09:19:33AM -0000, Dan Watkins wrote:

> Someone in #ubuntu gave me http://paste.ubuntu.com/17112254/ as a
> sources.list from a fresh xenial desktop install; it looks like the issue
> exists on desktop too.

Ok wow, horrible (and confirmed).

On Wed, Jun 08, 2016 at 09:15:33AM -0000, Dan Watkins wrote:
> http://paste.ubuntu.com/17112222/ is what I have on my desktop (which was
> a trusty install originally); that looks correct to me. I'll modify the
> wording in my proposal to use that.

Thanks!

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 2016-06-07 09:31:37 +0000
3+++ debian/changelog 2016-06-08 09:49:29 +0000
4@@ -29,6 +29,7 @@
5 * drop flash-kernel from snappy, it is useless there
6 * create /boot/uboot dir on all arches and configure /etc/fw_env.config
7 everywhere
8+<<<<<<< TREE
9 * adjust motd message on snappy (capitalize "Snappy Ubuntu Core" and replace
10 the "snappy --help" with "snap --help"
11
12@@ -38,6 +39,16 @@
13 on dual-stack gl/gles arches where things don't quite work right.
14
15 -- Adam Conrad <adconrad@ubuntu.com> Thu, 26 May 2016 21:05:28 -0600
16+=======
17+
18+ [ Daniel Watkins ]
19+ * Don't overwrite the default sources.list in cloud images.
20+ * Replace sources.list generated using COMPONENTS with the sources.list from
21+ an Ubuntu Server installation (i.e. with all components enabled, and all
22+ deb-src lines commented).
23+
24+ -- Oliver Grawert <ogra@ubuntu.com> Fri, 13 May 2016 21:01:34 +0200
25+>>>>>>> MERGE-SOURCE
26
27 livecd-rootfs (2.410) yakkety; urgency=medium
28
29
30=== modified file 'live-build/auto/build'
31--- live-build/auto/build 2016-05-30 15:45:20 +0000
32+++ live-build/auto/build 2016-06-08 09:49:29 +0000
33@@ -58,116 +58,56 @@
34 # preinstalled being slightly different in what it doesn't ask) from
35 # debian-installer's apt-setup:
36
37-codename=$LB_DISTRIBUTION
38-file="chroot/etc/apt/sources.list"
39-dists="main"
40-alldists="main"
41-if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q restricted; then
42- dists="$dists restricted"
43- alldists="$alldists restricted"
44-fi
45-if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q universe; then
46- UNIVERSE=true
47-else
48- UNIVERSE=false
49-fi
50-if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q multiverse; then
51- MULTIVERSE=true
52-else
53- MULTIVERSE=false
54-fi
55-
56-cat > $file <<EOF
57+cat > chroot/etc/apt/sources.list << EOF
58 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
59 # newer versions of the distribution.
60-
61-deb $LB_PARENT_MIRROR_BINARY $codename $dists
62-deb-src $LB_PARENT_MIRROR_BINARY $codename $dists
63+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION main restricted
64+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION main restricted
65
66 ## Major bug fix updates produced after the final release of the
67 ## distribution.
68-deb $LB_PARENT_MIRROR_BINARY $codename-updates $dists
69-deb-src $LB_PARENT_MIRROR_BINARY $codename-updates $dists
70-EOF
71+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
72+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
73
74-# Even if universe isn't enabled, we write example lines for it.
75-echo >> $file
76-if [ "$UNIVERSE" = true ]; then
77- alldists="$alldists universe"
78- COMMENT=
79-else
80- cat >> $file <<EOF
81-## Uncomment the following two lines to add software from the 'universe'
82-## repository.
83-EOF
84- COMMENT='# '
85-fi
86-cat >> $file <<EOF
87 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
88 ## team. Also, please note that software in universe WILL NOT receive any
89 ## review or updates from the Ubuntu security team.
90-${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename universe
91-${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename universe
92-${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-updates universe
93-${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-updates universe
94-EOF
95-
96-# Multiverse is different, don't write anything unless enabled.
97-if [ "$MULTIVERSE" = true ]; then
98- alldists="$alldists multiverse"
99- cat >> $file <<EOF
100-
101-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
102-## team, and may not be under a free licence. Please satisfy yourself as to
103-## your rights to use the software. Also, please note that software in
104+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION universe
105+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION universe
106+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates universe
107+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates universe
108+
109+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
110+## team, and may not be under a free licence. Please satisfy yourself as to
111+## your rights to use the software. Also, please note that software in
112 ## multiverse WILL NOT receive any review or updates from the Ubuntu
113 ## security team.
114-deb $LB_PARENT_MIRROR_BINARY $codename multiverse
115-deb-src $LB_PARENT_MIRROR_BINARY $codename multiverse
116-deb $LB_PARENT_MIRROR_BINARY $codename-updates multiverse
117-deb-src $LB_PARENT_MIRROR_BINARY $codename-updates multiverse
118-EOF
119-fi
120-
121-cat >> $file <<EOF
122+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION multiverse
123+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION multiverse
124+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates multiverse
125+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates multiverse
126
127 ## N.B. software from this repository may not have been tested as
128 ## extensively as that contained in the main release, although it includes
129 ## newer versions of some applications which may provide useful features.
130 ## Also, please note that software in backports WILL NOT receive any review
131 ## or updates from the Ubuntu security team.
132-# deb $LB_PARENT_MIRROR_BINARY $codename-backports $alldists
133-# deb-src $LB_PARENT_MIRROR_BINARY $codename-backports $alldists
134-EOF
135-
136-cat >> $file <<EOF
137-
138-deb $LB_PARENT_MIRROR_BINARY $codename-security $dists
139-deb-src $LB_PARENT_MIRROR_BINARY $codename-security $dists
140-EOF
141-
142-# Security sources for Ubuntu universe; not used much, but e.g. unsupported
143-# binary packages from a supported source package will end up here.
144-if [ "$UNIVERSE" = true ]; then
145- COMMENT=
146-else
147- COMMENT='# '
148-fi
149-cat >> $file <<EOF
150-${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-security universe
151-${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-security universe
152-EOF
153-
154-# Security sources for Ubuntu multiverse, with the same caveats as for
155-# universe.
156-if [ "$MULTIVERSE" = true ]; then
157- COMMENT=
158-else
159- COMMENT='# '
160-fi
161-cat >> $file <<EOF
162-${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-security multiverse
163-${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-security multiverse
164+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-backports main restricted universe multiverse
165+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-backports main restricted universe multiverse
166+
167+## Uncomment the following two lines to add software from Canonical's
168+## 'partner' repository.
169+## This software is not part of Ubuntu, but is offered by Canonical and the
170+## respective vendors as a service to Ubuntu users.
171+# deb http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
172+# deb-src http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
173+
174+deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
175+# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
176+deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
177+# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
178+deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
179+# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
180 EOF
181
182 fi
183@@ -251,16 +191,6 @@
184 build_name: server
185 serial: $BUILDSTAMP
186 EOF
187- cat > chroot/etc/apt/sources.list << EOF
188-deb ${LB_PARENT_MIRROR_BINARY} ${LB_DISTRIBUTION} main restricted universe multiverse
189-deb ${LB_PARENT_MIRROR_BINARY} ${LB_DISTRIBUTION}-updates main restricted universe multiverse
190-deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security main restricted universe multiverse
191-EOF
192- lb chroot_hosts install
193- lb chroot_resolv install
194- Chroot chroot "apt-get update"
195- lb chroot_resolv remove
196- lb chroot_hosts remove
197 fi
198
199 echo "===== Checking size of /usr/share/doc ====="

Subscribers

People subscribed via source and target branches