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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Fri Nov 26 02:22:15 2004
New Revision: 263

Modified:
   people/vagrant/simple-cdd/CONF.sh
   people/vagrant/simple-cdd/build-simple-cdd
Log:
include additional files into the simple-cdd dir on the CD.  rename default value for BASE_INCLUDE


Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh	(original)
+++ people/vagrant/simple-cdd/CONF.sh	Fri Nov 26 02:22:15 2004
@@ -90,7 +90,7 @@
 ## More debian-cd options ##
 
 # packages to include in initial debootstrap install
-BASE_INCLUDE=$simple_cdd_dir/base_include
+BASE_INCLUDE=$simple_cdd_dir/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"

Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Fri Nov 26 02:22:15 2004
@@ -131,7 +131,11 @@
 extras_dir="$simple_cdd_dir/extras/simple-cdd"
 mkdir -p $extras_dir
 
-all_extras="$package_files $preseed_files $simple_cdd_dir/simple-cdd-profiles"
+for f in simple-cdd-profiles simple-cdd simple-cdd.mnu simple-cdd-profiles ; do
+  all_extras="$all_extras $simple_cdd_dir/$f"
+done
+
+all_extras="$all_extras $package_files $preseed_files"
 # copy files to extras directory
 for file in $all_extras ; do
   cp -f $file $extras_dir/