From e690e4bdf702a27b3d11fa80b6e7507e0cfab469 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Fri, 20 May 2016 16:40:41 +0100 Subject: [PATCH] [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 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 ====="