Merge lp:~nobuto/ubuntu/quantal/ubuntu-defaults-builder/add-mirror into lp:ubuntu/quantal/ubuntu-defaults-builder

[Nobuto Murata]

ubuntu-default-image cannot specify an archive mirror.

default servers below is not so fast for everyone, it takes fair amount of time for build compared to use an archive mirror.
 - http://archive.ubuntu.com/ubuntu
 - http://security.ubuntu.com/ubuntu

This branch adds --mirror and --security-mirror to use an archive mirror during build.

--mirror and --security-mirror are incompatible with --keep-apt and --keep-apt-components. give an error and exit for now if both are specified.

[Martin Pitt (pitti)]

I don't understand why --mirror conflicts with --keep-apt? The globs are deliberately set up so that they do not assume a particular mirror. The output you showed in comment 3 looks just fine?

Thanks for working on this!

review: Needs Fixing

[lp:~nobuto/ubuntu/quantal/ubuntu-defaults-builder/add-mirror]

158. By Nobuto Murata on 2012-09-19

just revert last revision.
/var/lib/apt/lists/MIRROR_* seems to be deleted on lb_chroot_archives.

[Nobuto Murata (nobuto)]

Hi Martin,

I reverted a revision of "keep-apt check".

comment 3 was the output without --keep-apt,
so /var/lib/apt/lists/ftp.jaist.ac.jp_pub_Linux_ubuntu_dists* were removed.
I thought that if --keep-apt is specified, /var/lib/apt/lists/ftp.jaist.ac.jp_pub_Linux_ubuntu_dists* will be in a built image. but the built image has plain sources.list with {archive,security}.ubuntu.com, so /var/lib/apt/lists/ftp.jaist.ac.jp_pub_Linux_ubuntu_dists* will not be used in live-session and will waste space of the built image.

Anyway I found that /var/lib/apt/lists/* will be re-generated on `lb_chroot_archives chroot remove` after config/hooks/90_cleanup.chroot. with or without --keep-apt, /var/lib/apt/lists/ftp.jaist.ac.jp_pub_Linux_ubuntu_dists* will be deleted on `lb_chroot_archives chroot remove`.

review: Needs Resubmitting

[Nobuto Murata (nobuto)]

An issue "--keep-apt and --keep-apt-components seems not working" is reported as Bug #1053008.

[Martin Pitt (pitti)]

Ah of course, I understand. So --mirror uses that mirror for constructing the image, but it does _not_ set that mirror as a default apt source in the image itself. I had expected the mirror to also be set for the target system apt, but I guess depending on the use case this may or may not be desired. I guess eventually we want an option to do that as well, but for now I'll merge your r157 which makes them incompatible.

Thanks, and sorry for the confusion!

review: Approve

[Nobuto Murata (nobuto)]

Martin, thanks for the merge!

Changing target's sources.list is quite easy by passing LB_MIRROR_BINARY and LB_MIRROR_BINARY_SECURITY. Those will be used on live-session, but sources.list of installed target will be re-generated by ubiquity or d-i as far as I understand.

if someone wants a mirror used on everywhere including installed target, more work will be needed like passing preseeded file of a mirror url to ubiquity, I'm afraid.

=== modified file 'bin/ubuntu-defaults-image'
--- bin/ubuntu-defaults-image	2012-09-17 13:39:01 +0000
+++ bin/ubuntu-defaults-image	2012-09-19 15:40:24 +0000
@@ -24,6 +24,8 @@
 PACKAGE=
 ARCH=
 COMPONENTS=
+MIRROR=
+SECURITY_MIRROR=
 PPA=
 FLAVOUR=ubuntu
 SUITE=$(lsb_release -sc)
@@ -44,6 +46,10 @@
   --arch                  : Architecture [default: $ARCH]
   --release RELEASE       : Ubuntu release the image is based on [default: $SUITE]
   --components COMPONENTS : List of archive components to enable [default: main,restricted]
+  --mirror                : Ubuntu mirror to be used during build
+                            [default: http://archive.ubuntu.com/ubuntu/]
+  --security-mirror       : Ubuntu security mirror to be used during build
+                            [default: http://security.ubuntu.com/ubuntu/]
   --ppa USER/PPANAME      : Enable additional PPA [default: none]
   --keep-apt              : Do not remove apt indexes from live system
   --keep-apt-components COMPONENTS : 
@@ -73,7 +79,7 @@
     echo "$DEB_PPA" > config/archives/ubuntu-defaults.binary.list
 }
 
-eval set -- "$(getopt -o '' -l help,locale:,keep-apt,keep-apt-components:,package:,arch:,release:,components:,ppa: -- "$@")" || { help; exit 1; }
+eval set -- "$(getopt -o '' -l help,locale:,keep-apt,keep-apt-components:,package:,arch:,release:,components:,mirror:,security-mirror:,ppa: -- "$@")" || { help; exit 1; }
 while :; do
     case $1 in
 	--help)
@@ -100,6 +106,14 @@
 	    COMPONENTS="$(echo "$2" | sed 's/,/ /g' | tr -s ' ')"
 	    shift 2
 	    ;;
+	--mirror)
+	    MIRROR="$2"
+	    shift 2
+	    ;;
+	--security-mirror)
+	    SECURITY_MIRROR="$2"
+	    shift 2
+	    ;;
 	--ppa)
 	    PPA="$2"
 	    if ! expr match "$PPA" '^[.[:alnum:]-]\+/[[:alnum:]-]\+$' >/dev/null; then
@@ -177,6 +191,7 @@
 rm -f .stage/config
 
 SUITE="$SUITE" PROJECT="$FLAVOUR" ARCH="$ARCH" LB_ARCHITECTURES="$ARCH" \
+    LB_MIRROR_BOOTSTRAP="$MIRROR" LB_MIRROR_CHROOT_SECURITY="$SECURITY_MIRROR" \
     IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid lb config
 
 if [ "$COMPONENTS" ]; then