Import patches-unapplied version 2.228 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: eb1f0128d3f98685a2f644dadf1a7fa4d9dfe052

New changelog entries:
  * Pass --mirror-binary in the ubuntu-rtm case too; this isn't inherited
    from the bootstrap mirror.
This commit is contained in:
Colin Watson 2014-07-23 11:51:11 +01:00 committed by usd-importer
parent eb1f0128d3
commit ce12eac0a5
2 changed files with 9 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.228) utopic; urgency=medium
* Pass --mirror-binary in the ubuntu-rtm case too; this isn't inherited
from the bootstrap mirror.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 23 Jul 2014 11:51:11 +0100
livecd-rootfs (2.227) utopic; urgency=medium
* Pass --mirror-chroot-security and --mirror-binary-security in the

View File

@ -347,11 +347,13 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--apt-secure false"
OPTS="${OPTS:+$OPTS }--mirror-chroot-security ${MIRROR}"
OPTS="${OPTS:+$OPTS }--mirror-binary-security ${MIRROR}"
OPTS="${OPTS:+$OPTS }--mirror-binary ${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}"
OPTS="${OPTS:+$OPTS }--mirror-binary ${MIRROR}"
;;
esac
;;