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.
This commit is contained in:
Colin Watson 2014-07-23 11:00:23 +01:00 committed by usd-importer
parent 23bffaae7f
commit eb1f0128d3
2 changed files with 12 additions and 0 deletions

8
debian/changelog vendored
View File

@ -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 <cjwatson@ubuntu.com> Wed, 23 Jul 2014 11:00:23 +0100
livecd-rootfs (2.226) utopic; urgency=medium
* Disable apt authentication checks when building ubuntu-rtm images

View File

@ -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
;;