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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Thu Nov 25 16:56:10 2004
New Revision: 247

Added:
   people/vagrant/simple-cdd/default.downloads
      - copied, changed from r241, people/vagrant/simple-cdd/simple-cdd-downloads.list
   people/vagrant/simple-cdd/default.packages
      - copied, changed from r239, people/vagrant/simple-cdd/simple-cdd-packages.list
   people/vagrant/simple-cdd/lessdisks.downloads
   people/vagrant/simple-cdd/lessdisks.packages
Removed:
   people/vagrant/simple-cdd/simple-cdd-downloads.list
   people/vagrant/simple-cdd/simple-cdd-packages.list
Modified:
   people/vagrant/simple-cdd/CONF.sh
   people/vagrant/simple-cdd/TODO
   people/vagrant/simple-cdd/build-simple-cdd
   people/vagrant/simple-cdd/default.preseed
Log:
rudimentary support for profiles.


Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh	(original)
+++ people/vagrant/simple-cdd/CONF.sh	Thu Nov 25 16:56:10 2004
@@ -35,11 +35,15 @@
 preseed_files=""
 
 # files which contain lists of packages
-package_files="simple-cdd-packages.list simple-cdd-downloads.list"
+package_files=""
 
 # list of packages to mirror
 all_packages=""
 
+# profiles to include.  must have a $profilename.preseed and/or
+# $profilename.packages file in $simple_cdd_dir
+profiles="default"
+#profiles="default lessdisks"
 
 ## debpartial-mirror values ##
 

Modified: people/vagrant/simple-cdd/TODO
==============================================================================
--- people/vagrant/simple-cdd/TODO	(original)
+++ people/vagrant/simple-cdd/TODO	Thu Nov 25 16:56:10 2004
@@ -1,5 +1,3 @@
-simplify and trim out extra info in CONF.sh, or split into several files.
-
 use preseed include mechanisms rather than simply appending to default
 preseeding file.
 

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:56:10 2004
@@ -12,6 +12,20 @@
   exit 1
 fi
 
+# include package and preseed files for profiles
+for p in $profiles ; do
+  pfile="$simple_cdd_dir/$p"
+  if [ -r "$pfile.preseed" ]; then
+    preseed_files="$preseed_files $pfile.preseed"
+  fi
+  if [ -r "$pfile.packages" ]; then
+    package_files="$package_files $pfile.packages"
+  fi
+  if [ -r "$pfile.downloads" ]; then
+    package_files="$package_files $pfile.downloads"
+  fi
+done
+
 # get lists of packages from files
 for l in $package_files ; do
   all_packages="$all_packages $(egrep -v ^# $l)"
@@ -98,7 +112,7 @@
 echo simple-cdd: packages
 make packages
 
-all_extras="$simple_cdd_dir/default.preseed $simple_cdd_dir/simple-cdd-packages.list $package_files $preseed_files"
+all_extras="$package_files $preseed_files"
 mkdir -p $simple_cdd_dir/extras/simple-cdd
 for f in $all_extras ; do
   cp -f $f $simple_cdd_dir/extras/simple-cdd/

Copied: people/vagrant/simple-cdd/default.downloads (from r241, people/vagrant/simple-cdd/simple-cdd-downloads.list)
==============================================================================
--- people/vagrant/simple-cdd/simple-cdd-downloads.list	(original)
+++ people/vagrant/simple-cdd/default.downloads	Thu Nov 25 16:56:10 2004
@@ -2,16 +2,6 @@
 kernel-image-2.4-386
 grub
 
-# i like to download these, too.
-lessdisks
-lessdisks-xterminal
-lessdisks-cloner-terminal
-lessdisks-cloner-server
-sdm
-sdm-terminal
-xdialog
-kernel-image-netbootable
-
 # debian-installer wants to install these for some reason:
 mdetect
 read-edid

Copied: people/vagrant/simple-cdd/default.packages (from r239, people/vagrant/simple-cdd/simple-cdd-packages.list)
==============================================================================
--- people/vagrant/simple-cdd/simple-cdd-packages.list	(original)
+++ people/vagrant/simple-cdd/default.packages	Thu Nov 25 16:56:10 2004
@@ -1,4 +1,4 @@
-# examples for a demo lessdisks/sdm server
+# examples for a simple demo lessdisks/sdm server
 lessdisks
 sdm
 xdialog

Modified: people/vagrant/simple-cdd/default.preseed
==============================================================================
--- people/vagrant/simple-cdd/default.preseed	(original)
+++ people/vagrant/simple-cdd/default.preseed	Thu Nov 25 16:56:10 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 ^[a-z0-9] /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/default.packages)
 
 #### Network configuration.
 

Added: people/vagrant/simple-cdd/lessdisks.downloads
==============================================================================
--- (empty file)
+++ people/vagrant/simple-cdd/lessdisks.downloads	Thu Nov 25 16:56:10 2004
@@ -0,0 +1,9 @@
+# lessdisks should include all this stuff, too.
+lessdisks
+lessdisks-xterminal
+lessdisks-cloner-terminal
+lessdisks-cloner-server
+sdm
+sdm-terminal
+xdialog
+kernel-image-netbootable

Added: people/vagrant/simple-cdd/lessdisks.packages
==============================================================================
--- (empty file)
+++ people/vagrant/simple-cdd/lessdisks.packages	Thu Nov 25 16:56:10 2004
@@ -0,0 +1,6 @@
+# examples for a simple demo lessdisks/sdm server
+lessdisks
+sdm
+xdialog
+aterm
+icewm