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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Thu Nov 25 16:28:46 2004
New Revision: 246

Modified:
   people/vagrant/simple-cdd/CONF.sh
   people/vagrant/simple-cdd/build-simple-cdd
   people/vagrant/simple-cdd/default.preseed
Log:
add more files into the extra dir, packages file can now contain comments, commented out example for serial console., 


Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh	(original)
+++ people/vagrant/simple-cdd/CONF.sh	Thu Nov 25 16:28:46 2004
@@ -25,6 +25,8 @@
 # kernel parameters passed to the CD bootloader.
 # works with isolinux on i386.
 export KERNEL_PARAMS="preseed/file=/cdrom/simple-cdd/default.preseed"
+# use serial console
+#export KERNEL_PARAMS="preseed/file=/cdrom/simple-cdd/default.preseed console=ttyS0,38400"
 # preselect language and country settings.
 #export KERNEL_PARAMS="preseed/file=/cdrom/simple-cdd/default.preseed languagechooser/language-name=English countrychooser/shortlist=US"
 

Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Thu Nov 25 16:28:46 2004
@@ -98,9 +98,11 @@
 echo simple-cdd: packages
 make packages
 
+all_extras="$simple_cdd_dir/default.preseed $simple_cdd_dir/simple-cdd-packages.list $package_files $preseed_files"
 mkdir -p $simple_cdd_dir/extras/simple-cdd
-cp -f $simple_cdd_dir/default.preseed $simple_cdd_dir/extras/simple-cdd/
-cp -f $simple_cdd_dir/simple-cdd-packages.list $simple_cdd_dir/extras/simple-cdd/
+for f in $all_extras ; do
+  cp -f $f $simple_cdd_dir/extras/simple-cdd/
+done
 
 # TODO modify default.preseed to include other files
 for a in $preseed_files ; do

Modified: people/vagrant/simple-cdd/default.preseed
==============================================================================
--- people/vagrant/simple-cdd/default.preseed	(original)
+++ people/vagrant/simple-cdd/default.preseed	Thu Nov 25 16:28:46 2004
@@ -63,7 +63,7 @@
 # prompt. This is a good way to install a set of packages you want, or to
 # tweak the configuration of the system.
 #base-config  base-config/late_command  string apt-get install zsh; chsh -s /bin/zsh
-base-config  base-config/late_command  string apt-get -yu install $(egrep -v ^# /usr/local/simple-cdd/simple-cdd-packages.list)
+base-config  base-config/late_command  string apt-get -yu install $(egrep ^[a-z0-9] /usr/local/simple-cdd/simple-cdd-packages.list)
 
 #### Network configuration.