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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Wed Dec  1 13:21:39 2004
New Revision: 295

Modified:
   people/vagrant/simple-cdd/CONF.sh
   people/vagrant/simple-cdd/build-simple-cdd
Log:
make variable for simplei-cdd temp dir so that TDIR variables can be at the bottom of the config file...


Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh	(original)
+++ people/vagrant/simple-cdd/CONF.sh	Wed Dec  1 13:21:39 2004
@@ -26,6 +26,9 @@
 debian_cd_dir=/usr/share/debian-cd
 #debian_cd_dir=$simple_cdd_dir/debian-cd
 
+# temporary directory for simple-cdd
+simple_cdd_temp="$simple_cdd_dir/tmp/"
+
 # get default values for most things
 . $debian_cd_dir/CONF.sh
 
@@ -56,10 +59,6 @@
 # list of packages to mirror
 all_packages=""
 
-# debian-cd temporary directories
-export TDIR=$simple_cdd_dir/tmp/
-export APTTMP=$simple_cdd_dir/tmp/apt/
-
 ## debpartial-mirror values ##
 
 # call debpartial-mirror at each build- defaults to true.
@@ -84,7 +83,7 @@
 debpartial_debian_mirror="http://ftp.us.debian.org/debian/"
 
 # location of generated debpartial-mirror configuration file
-debpartial_conf="$TDIR/debpartial-mirror.conf"
+debpartial_conf="$simple_cdd_temp/debpartial-mirror.conf"
 
 
 ## values used by both debpartial-mirror and debian-cd ##
@@ -93,7 +92,7 @@
 export MIRROR=$simple_cdd_dir/mirror/
 
 # location of generated task file, used by debian-cd and debpartial-mirror
-export TASK=$TDIR/simple-cdd.task
+export TASK=$simple_cdd_temp/simple-cdd.task
 
 # these are generally debian-cd files which should get included in the task file
 includes="$BASEDIR/tasks/debian-installer+kernel $BASEDIR/tasks/debian-installer $BASEDIR/tasks/base-$CODENAME"
@@ -101,7 +100,7 @@
 ## More debian-cd options ##
 
 # packages to include in initial debootstrap install
-export BASE_INCLUDE=$TDIR/simple-cdd.$CODENAME.base_include
+export BASE_INCLUDE=$simple_cdd_temp/simple-cdd.$CODENAME.base_include
 # if this is set, generate a base includes file with the listed packages.
 # order is important, and dependency resolution must be done manually...
 base_include_packages="$(/usr/sbin/debootstrap --arch $ARCH --print-debs $CODENAME) debconf-utils"
@@ -109,6 +108,10 @@
 # location where generated CD image(s) will be put
 export OUT=$simple_cdd_dir/images/
 
+# debian-cd temporary directories
+export TDIR="$simple_cdd_temp"
+export APTTMP="$TDIR/apt/"
+
 # increase the size limit if debian-cd tries to make more CDs than you
 # want, and the generated CDs are smaller than 650MB.
 export SIZELIMIT=739631360

Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Wed Dec  1 13:21:39 2004
@@ -11,7 +11,7 @@
 
 mkdir -p "$simple_cdd_dir"
 # create temp directory
-mkdir -p "$TDIR"
+mkdir -p "$simple_cdd_temp"
 
 if [ ! -d "$simple_cdd_dir" ] ; then
   echo "ERROR: directory not found: $simple_cdd_dir"