sources.list needs to support multiple dists - #124

files/sources.list

@@ -1,9 +1,9 @@
-deb http://us.archive.ubuntu.com/ubuntu/ natty main restricted
-deb http://us.archive.ubuntu.com/ubuntu/ natty-updates main restricted
-deb http://us.archive.ubuntu.com/ubuntu/ natty universe
-deb http://us.archive.ubuntu.com/ubuntu/ natty-updates universe
-deb http://us.archive.ubuntu.com/ubuntu/ natty multiverse
-deb http://us.archive.ubuntu.com/ubuntu/ natty-updates multiverse
-deb http://security.ubuntu.com/ubuntu natty-security main restricted
-deb http://security.ubuntu.com/ubuntu natty-security universe
-deb http://security.ubuntu.com/ubuntu natty-security multiverse
+deb http://us.archive.ubuntu.com/ubuntu/ %DIST% main restricted
+deb http://us.archive.ubuntu.com/ubuntu/ %DIST%-updates main restricted
+deb http://us.archive.ubuntu.com/ubuntu/ %DIST% universe
+deb http://us.archive.ubuntu.com/ubuntu/ %DIST%-updates universe
+deb http://us.archive.ubuntu.com/ubuntu/ %DIST% multiverse
+deb http://us.archive.ubuntu.com/ubuntu/ %DIST%-updates multiverse
+deb http://security.ubuntu.com/ubuntu %DIST%-security main restricted
+deb http://security.ubuntu.com/ubuntu %DIST%-security universe
+deb http://security.ubuntu.com/ubuntu %DIST%-security multiverse

tools/get_uec_image.sh

@@ -109,6 +109,7 @@ if [ ! -e $CACHEDIR/$UEC_NAME-disk1.img ]; then
 
     # Install our required packages
     cp -p files/sources.list $MNTDIR/etc/apt/sources.list
+    sed -e "s,%DIST%,$DIST_NAME,g" -i $MNTDIR/etc/apt/sources.list
     cp -p /etc/resolv.conf $MNTDIR/etc/resolv.conf
     chroot $MNTDIR apt-get update
     chroot $MNTDIR apt-get install -y $MIN_PKGS

tools/make_image.sh

@@ -138,6 +138,7 @@ if [ -n "$CHROOTONLY" ]; then
       --addpkg=$MIN_PKGS \
 
     sudo cp -p files/sources.list $CHROOTDIR/etc/apt/sources.list
+    sed -e "s,%DIST%,$RELEASE,g" -i $CHROOTDIR/etc/apt/sources.list
     sudo chroot $CHROOTDIR apt-get update
 
     exit 0