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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Sun Nov 21 11:55:27 2004
New Revision: 222

Modified:
   people/vagrant/simple-cdd/CONF.sh
   people/vagrant/simple-cdd/build-simple-cdd
Log:
use conf file variables for files and debian mirror in debpartial-mirror.conf


Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh	(original)
+++ people/vagrant/simple-cdd/CONF.sh	Sun Nov 21 11:55:27 2004
@@ -311,3 +311,10 @@
 all_packages=""
 
 #export http_proxy=http://localhost:3128
+
+# debpartial-mirror.conf files variable
+# TODO when sarge is ready, use $CODENAME instead of sid
+debpartial_files="README doc/ tools/ indices/ dists/sid/main/installer-i386/current/"
+
+# debpartial-mirror server variable
+debpartial_debian_mirror="http://ftp.us.debian.org/debian"

Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Sun Nov 21 11:55:27 2004
@@ -41,13 +41,15 @@
 
 # generate debpartial-mirror.conf
 
+# TODO check if variables used in conf file generation are set.
+
 echo [mirror] > $debpartial_conf
-echo server=http://ftp.us.debian.org/debian/ >> $debpartial_conf
+echo server=$debpartial_debian_mirror >> $debpartial_conf
 
 echo local_directory=$MIRROR >> $debpartial_conf
 
 # TODO use $CODENAME instead of sid.  sarge is not yet ready, though.
-echo files=README doc/ tools/ indices/ dists/sid/main/installer-i386/current/ >> $debpartial_conf
+echo files=$debpartial_files >> $debpartial_conf
 
 echo get_suggests=false >> $debpartial_conf
 
@@ -59,6 +61,7 @@
 
 echo [$CODENAME] >> $debpartial_conf
 
+# use '' to prevent shell expansion
 echo filter='main:*:standard main:*:required main:*:important main/debian-installer:*:*' >> $debpartial_conf
 
 echo include-task=$TASK >> $debpartial_conf