[Debian-NP-Commits] r229 - people/vagrant/simple-cdd

[Vagrant Cascadian]

Author: vagrant-guest
Date: Mon Nov 22 18:19:36 2004
New Revision: 229

Modified:
   people/vagrant/simple-cdd/build-simple-cdd
Log:
use codename variable instead of hard-coding sarge.


Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Mon Nov 22 18:19:36 2004
@@ -19,7 +19,7 @@
 done
 
 if [ -x /usr/sbin/debootstrap ]; then
-  all_packages="$all_packages $(/usr/sbin/debootstrap --print-debs sarge)"
+  all_packages="$all_packages $(/usr/sbin/debootstrap --print-debs $CODENAME)"
 else
   echo "WARNING: debootstrap not found, skipping..."
 fi
@@ -48,7 +48,6 @@
 
 echo local_directory=$MIRROR >> $debpartial_conf
 
-# TODO use $CODENAME instead of sid.  sarge is not yet ready, though.
 echo files=$debpartial_files >> $debpartial_conf
 
 echo get_suggests=false >> $debpartial_conf
@@ -77,9 +76,9 @@
 
 if [ "true" = "$use_sid_installer" ]; then
   cd $MIRROR/dists
-  echo "WARNING: using sid installer instead of sarge installer"
-  mkdir -p sarge/main/installer-i386/current
-  rsync --delete -aWHr sid/main/installer-i386/current/. sarge/main/installer-i386/current/
+  echo "WARNING: using sid installer instead of $CODENAME installer"
+  mkdir -p $CODENAME/main/installer-i386/current
+  rsync --delete -aWHr sid/main/installer-i386/current/. $CODENAME/main/installer-i386/current/
 fi
 
 cd $BASEDIR