[Debian-NP-Commits] r292 - in people/vagrant/simple-cdd: . profiles

[Vagrant Cascadian]

Author: vagrant-guest
Date: Wed Dec  1 12:50:39 2004
New Revision: 292

Modified:
   people/vagrant/simple-cdd/CONF.sh
   people/vagrant/simple-cdd/profiles/lessdisks.downloads
Log:
add type-handling package, put TASK and BASE_INCLUDES into temp dir.


Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh	(original)
+++ people/vagrant/simple-cdd/CONF.sh	Wed Dec  1 12:50:39 2004
@@ -82,11 +82,15 @@
 
 ## values used by both debpartial-mirror and debian-cd ##
 
+# debian-cd temporary directories
+export TDIR=$simple_cdd_dir/tmp/
+export APTTMP=$simple_cdd_dir/tmp/apt/
+
 # directory of debian mirror, used by both debpartial-mirror and debian-cd
 export MIRROR=$simple_cdd_dir/mirror/
 
 # location of generated task file, used by debian-cd and debpartial-mirror
-export TASK=$simple_cdd_dir/simple-cdd.task
+export TASK=$TDIR/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"
@@ -94,7 +98,7 @@
 ## More debian-cd options ##
 
 # packages to include in initial debootstrap install
-export BASE_INCLUDE=$simple_cdd_dir/simple-cdd.$CODENAME.base_include
+export BASE_INCLUDE=$TDIR/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"
@@ -102,10 +106,6 @@
 # location where generated CD image(s) will be put
 export OUT=$simple_cdd_dir/images/
 
-# debian-cd temporary directories
-export TDIR=$simple_cdd_dir/tmp/
-export APTTMP=$simple_cdd_dir/tmp/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/profiles/lessdisks.downloads
==============================================================================
--- people/vagrant/simple-cdd/profiles/lessdisks.downloads	(original)
+++ people/vagrant/simple-cdd/profiles/lessdisks.downloads	Wed Dec  1 12:50:39 2004
@@ -7,3 +7,5 @@
 sdm-terminal
 xdialog
 kernel-image-netbootable
+# kernel-image-netbootable in sarge requires type-handling
+type-handling