From eb1f0128d3f98685a2f644dadf1a7fa4d9dfe052 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 23 Jul 2014 11:00:23 +0100 Subject: [PATCH] Import patches-unapplied version 2.227 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: 23bffaae7fa07e5e2f84fda2bfadf07adbe2fa04 New changelog entries: * Pass --mirror-chroot-security and --mirror-binary-security in the ubuntu-rtm case, as the default of http://security.ubuntu.com/ubuntu/ isn't going to have ubuntu-rtm suites. --- debian/changelog | 8 ++++++++ live-build/auto/config | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 84fc082c..2610c164 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.227) utopic; urgency=medium + + * Pass --mirror-chroot-security and --mirror-binary-security in the + ubuntu-rtm case, as the default of http://security.ubuntu.com/ubuntu/ + isn't going to have ubuntu-rtm suites. + + -- Colin Watson Wed, 23 Jul 2014 11:00:23 +0100 + livecd-rootfs (2.226) utopic; urgency=medium * Disable apt authentication checks when building ubuntu-rtm images diff --git a/live-build/auto/config b/live-build/auto/config index a16529fb..d3aafda5 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -345,9 +345,13 @@ case $PROJECT in ubuntu-rtm/dogfood) MIRROR=http://derived-archive.dogfood.content.paddev.net/ubuntu-rtm/ OPTS="${OPTS:+$OPTS }--apt-secure false" + OPTS="${OPTS:+$OPTS }--mirror-chroot-security ${MIRROR}" + OPTS="${OPTS:+$OPTS }--mirror-binary-security ${MIRROR}" ;; ubuntu-rtm) MIRROR=http://derived.archive.canonical.com/ubuntu-rtm/ + OPTS="${OPTS:+$OPTS }--mirror-chroot-security ${MIRROR}" + OPTS="${OPTS:+$OPTS }--mirror-binary-security ${MIRROR}" ;; esac ;;