From e690e4bdf702a27b3d11fa80b6e7507e0cfab469 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Fri, 20 May 2016 16:40:41 +0100
Subject: [PATCH 1/4] [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.
---
 debian/changelog      |  3 +++
 live-build/auto/build | 10 ----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 218a340f..926b839c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ livecd-rootfs (2.411) UNRELEASED; urgency=medium
   * create /boot/uboot dir on all arches and configure /etc/fw_env.config
     everywhere
 
+  [ Daniel Watkins ]
+  * Don't overwrite the default sources.list in cloud images.
+
  -- Oliver Grawert <ogra@ubuntu.com>  Fri, 13 May 2016 21:01:34 +0200
 
 livecd-rootfs (2.410) yakkety; urgency=medium
diff --git a/live-build/auto/build b/live-build/auto/build
index cb40d4f8..bfb1bc76 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -251,16 +251,6 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
 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 ====="

From 407cd3b8123bb440d8f0c20951212eb51b3a2c2b Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Wed, 8 Jun 2016 10:47:22 +0100
Subject: [PATCH 2/4] 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).

---
 debian/changelog      |   3 +
 live-build/auto/build | 124 +++++++++++-------------------------------
 2 files changed, 36 insertions(+), 91 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 926b839c..413d7eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ livecd-rootfs (2.411) UNRELEASED; urgency=medium
 
   [ 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 <ogra@ubuntu.com>  Fri, 13 May 2016 21:01:34 +0200
 
diff --git a/live-build/auto/build b/live-build/auto/build
index bfb1bc76..6e89f39b 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -58,116 +58,58 @@ EOF
 # 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
+## 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
+## universe WILL NOT receive any review or updates from the Ubuntu security
+## team.
+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

From 79cf11a25a89dbc19edcf3c0025b10cef8c99d04 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Wed, 8 Jun 2016 10:48:16 +0100
Subject: [PATCH 3/4] Use the correct (pre-xenial) universe sources.list
 comment

---
 live-build/auto/build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index 6e89f39b..f9745a96 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -70,10 +70,8 @@ deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
 # deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
 
 ## 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
-## universe WILL NOT receive any review or updates from the Ubuntu security
-## team.
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
 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

From 8940890039c192e33cf59a736991d5cee6b86a3e Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Wed, 8 Jun 2016 10:48:50 +0100
Subject: [PATCH 4/4] Remove some trailing spaces

---
 live-build/auto/build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index f9745a96..152c7cbd 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -77,9 +77,9 @@ deb $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 
+## 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 $LB_DISTRIBUTION multiverse