commit 97c84744cee0c70036ad0ebc89d634a9720b6293
author Jesse Andrews <anotherjesse@gmail.com> Mon Oct 31 11:45:17 2011 -0700
committer Jesse Andrews <anotherjesse@gmail.com> Mon Oct 31 11:45:27 2011 -0700
tree 031f7e00da743ba5d372aed250b1bc2386939b16
parent 95156a4e603a5a32a754307b666f010514b0384b

sources.list needs to support multiple dists - #124

files/sources.list

diff --git a/files/sources.list b/files/sources.list
index 96fab5f..a58eca3 100644
--- a/files/sources.list
+++ b/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

diff --git a/tools/get_uec_image.sh b/tools/get_uec_image.sh
index 526fb44..82bc9a6 100755
--- a/tools/get_uec_image.sh
+++ b/tools/get_uec_image.sh
@@ -109,6 +109,7 @@
 
     # 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

diff --git a/tools/make_image.sh b/tools/make_image.sh
index e957c75..a69f5e3 100755
--- a/tools/make_image.sh
+++ b/tools/make_image.sh
@@ -138,6 +138,7 @@
       --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