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

[Dan Watkins]

[Adam Conrad (adconrad)]

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)]

(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)

[lp:~daniel-thewatkins/livecd-rootfs/enable-backports]

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)]

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)]

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)]

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)]

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)]

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)]

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.

[lp:~daniel-thewatkins/livecd-rootfs/enable-backports]

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)]

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)]

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!

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-07 09:31:37 +0000
+++ debian/changelog	2016-06-08 09:49:29 +0000
@@ -29,6 +29,7 @@
   * drop flash-kernel from snappy, it is useless there
   * create /boot/uboot dir on all arches and configure /etc/fw_env.config
     everywhere
+<<<<<<< TREE
   * adjust motd message on snappy (capitalize "Snappy Ubuntu Core" and replace
     the "snappy --help" with "snap --help"
 
@@ -38,6 +39,16 @@
     on dual-stack gl/gles arches where things don't quite work right.
 
  -- Adam Conrad <[e-mail]>  Thu, 26 May 2016 21:05:28 -0600
+=======
+
+  [ Daniel Watkins ]
+  * Don't overwrite the default sources.list in cloud images.
+  * 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).
+
+ -- Oliver Grawert <[e-mail]>  Fri, 13 May 2016 21:01:34 +0200
+>>>>>>> MERGE-SOURCE
 
 livecd-rootfs (2.410) yakkety; urgency=medium
 

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2016-05-30 15:45:20 +0000
+++ live-build/auto/build	2016-06-08 09:49:29 +0000
@@ -58,116 +58,56 @@
 # preinstalled being slightly different in what it doesn't ask) from
 # debian-installer's apt-setup:
 
-codename=$LB_DISTRIBUTION
-file="chroot/etc/apt/sources.list"
-dists="main"
-alldists="main"
-if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q restricted; then
-	dists="$dists restricted"
-	alldists="$alldists restricted"
-fi
-if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q universe; then
-	UNIVERSE=true
-else
-	UNIVERSE=false
-fi
-if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q multiverse; then
-	MULTIVERSE=true
-else
-	MULTIVERSE=false
-fi
-
-cat > $file <<EOF
+cat > chroot/etc/apt/sources.list << EOF
 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
 # newer versions of the distribution.
-
-deb $LB_PARENT_MIRROR_BINARY $codename $dists
-deb-src $LB_PARENT_MIRROR_BINARY $codename $dists
+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION main restricted
+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb $LB_PARENT_MIRROR_BINARY $codename-updates $dists
-deb-src $LB_PARENT_MIRROR_BINARY $codename-updates $dists
-EOF
+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
 
-# Even if universe isn't enabled, we write example lines for it.
-echo >> $file
-if [ "$UNIVERSE" = true ]; then
-	alldists="$alldists universe"
-	COMMENT=
-else
-	cat >> $file <<EOF
-## Uncomment the following two lines to add software from the 'universe'
-## repository.
-EOF
-	COMMENT='# '
-fi
-cat >> $file <<EOF
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.
-${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename universe
-${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename universe
-${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-updates universe
-${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-updates universe
-EOF
-
-# Multiverse is different, don't write anything unless enabled.
-if [ "$MULTIVERSE" = true ]; then
-	alldists="$alldists multiverse"
-	cat >> $file <<EOF
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
-## team, and may not be under a free licence. Please satisfy yourself as to 
-## your rights to use the software. Also, please note that software in 
+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION universe
+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION universe
+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates universe
+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team, and may not be under a free licence. Please satisfy yourself as to
+## your rights to use the software. Also, please note that software in
 ## multiverse WILL NOT receive any review or updates from the Ubuntu
 ## security team.
-deb $LB_PARENT_MIRROR_BINARY $codename multiverse
-deb-src $LB_PARENT_MIRROR_BINARY $codename multiverse
-deb $LB_PARENT_MIRROR_BINARY $codename-updates multiverse
-deb-src $LB_PARENT_MIRROR_BINARY $codename-updates multiverse
-EOF
-fi
-
-cat >> $file <<EOF
+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION multiverse
+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION multiverse
+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates multiverse
+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates multiverse
 
 ## N.B. software from this repository may not have been tested as
 ## extensively as that contained in the main release, although it includes
 ## newer versions of some applications which may provide useful features.
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
-# deb $LB_PARENT_MIRROR_BINARY $codename-backports $alldists
-# deb-src $LB_PARENT_MIRROR_BINARY $codename-backports $alldists
-EOF
-
-cat >> $file <<EOF
-
-deb $LB_PARENT_MIRROR_BINARY $codename-security $dists
-deb-src $LB_PARENT_MIRROR_BINARY $codename-security $dists
-EOF
-
-# Security sources for Ubuntu universe; not used much, but e.g. unsupported
-# binary packages from a supported source package will end up here.
-if [ "$UNIVERSE" = true ]; then
-        COMMENT=
-else
-        COMMENT='# '
-fi
-cat >> $file <<EOF
-${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-security universe
-${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-security universe
-EOF
-
-# Security sources for Ubuntu multiverse, with the same caveats as for
-# universe.
-if [ "$MULTIVERSE" = true ]; then
-        COMMENT=
-else
-        COMMENT='# '
-fi
-cat >> $file <<EOF
-${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-security multiverse
-${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-security multiverse
+deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-backports main restricted universe multiverse
+# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-backports main restricted universe multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
+# deb-src http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
+
+deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
+# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
+deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
+# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
+deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
 EOF
 
 	fi
@@ -251,16 +191,6 @@
 build_name: server
 serial: $BUILDSTAMP
 EOF
-		cat > chroot/etc/apt/sources.list << EOF
-deb ${LB_PARENT_MIRROR_BINARY} ${LB_DISTRIBUTION} main restricted universe multiverse
-deb ${LB_PARENT_MIRROR_BINARY} ${LB_DISTRIBUTION}-updates main restricted universe multiverse
-deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security main restricted universe multiverse
-EOF
-		lb chroot_hosts install
-		lb chroot_resolv install
-		Chroot chroot "apt-get update"
-		lb chroot_resolv remove
-		lb chroot_hosts remove
 	fi
 
 	echo "===== Checking size of /usr/share/doc ====="