josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sources.list needs to support multiple dists - #124

Browse source
This commit is contained in:
Jesse Andrews 2011-10-31 11:45:17 -07:00
parent 95156a4e60
commit 97c84744ce
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
files/sources.list
View file

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

1
tools/get_uec_image.sh
View file

@ -109,6 +109,7 @@ if [ ! -e $CACHEDIR/$UEC_NAME-disk1.img ]; then
# Install our required packages # Install our required packages
cp -p files/sources.list $MNTDIR/etc/apt/sources.list 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 cp -p /etc/resolv.conf $MNTDIR/etc/resolv.conf
chroot $MNTDIR apt-get update chroot $MNTDIR apt-get update
chroot $MNTDIR apt-get install -y $MIN_PKGS chroot $MNTDIR apt-get install -y $MIN_PKGS

1
tools/make_image.sh
View file

@ -138,6 +138,7 @@ if [ -n "$CHROOTONLY" ]; then
--addpkg=$MIN_PKGS \ --addpkg=$MIN_PKGS \
sudo cp -p files/sources.list $CHROOTDIR/etc/apt/sources.list 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 sudo chroot $CHROOTDIR apt-get update
exit 0 exit 0