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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Fri Nov 26 13:11:42 2004
New Revision: 266

Removed:
   people/vagrant/simple-cdd/simple-cdd
   people/vagrant/simple-cdd/simple-cdd.mnu
Modified:
   people/vagrant/simple-cdd/build-simple-cdd
   people/vagrant/simple-cdd/default.preseed
   people/vagrant/simple-cdd/simple-cdd-profiles
Log:
maybe profile selection works now.


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 13:11:42 2004
@@ -131,7 +131,7 @@
 extras_dir="$simple_cdd_dir/extras/simple-cdd"
 mkdir -p $extras_dir
 
-for f in simple-cdd-profiles simple-cdd simple-cdd.mnu simple-cdd-profiles ; do
+for f in simple-cdd-profiles simple-cdd-packages simple-cdd-preseed ; do
   all_extras="$all_extras $simple_cdd_dir/$f"
 done
 

Modified: people/vagrant/simple-cdd/default.preseed
==============================================================================
--- people/vagrant/simple-cdd/default.preseed	(original)
+++ people/vagrant/simple-cdd/default.preseed	Fri Nov 26 13:11:42 2004
@@ -56,15 +56,15 @@
 # This command is run just before the install finishes, but when there is
 # still a usable /target directory.
 #d-i  preseed/late_command    string for deb in /hd-media/*.deb; do cp $deb /target/tmp; chroot /target dpkg -i /tmp/$(basename $deb); done
-d-i  preseed/late_command    string mkdir -p /target/usr/local/simple-cdd ; cp /cdrom/simple-cdd/* /target/usr/local/simple-cdd/ ; cp /cdrom/simple-cdd/simple-cdd /cdrom/simple-cdd/simple-cdd.mnu /target/usr/lib/base-config/menu/
+d-i  preseed/late_command    string mkdir -p /target/usr/local/simple-cdd ; cp /cdrom/simple-cdd/* /target/usr/local/simple-cdd/
 # This command is run just as base-config is starting up.
 #base-config  base-config/early_command string echo hi mom
-base-config  base-config/early_command string /usr/local/simple-cdd/simple-cdd-profiles
+base-config  base-config/early_command string /usr/local/simple-cdd/simple-cdd-profiles ; /usr/local/simple-cdd-preseed
 # This command is run after base-config is done, just before the login:
 # 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/install.packages)
+base-config  base-config/late_command  string /usr/local/simple-cdd/simple-cdd-packages
 
 #### Network configuration.
 

Modified: people/vagrant/simple-cdd/simple-cdd-profiles
==============================================================================
--- people/vagrant/simple-cdd/simple-cdd-profiles	(original)
+++ people/vagrant/simple-cdd/simple-cdd-profiles	Fri Nov 26 13:11:42 2004
@@ -1,12 +1,10 @@
 #!/bin/sh
 
-cd /usr/local/simple-cdd
+echo "loading simple-cdd templates..."
 
-echo "preparing to configure simple-cdd profiles..."
+debconf-loadtemplate simple-cdd /usr/local/simple-cdd/simple-cdd.templates
 
-debconf-loadtemplate simple-cdd ./simple-cdd.templates
-
-set -e
+echo "asking simple-cdd debconf questions..."
 
 # load debconf
 . /usr/share/debconf/confmodule
@@ -14,17 +12,3 @@
 db_input high simple-cdd/profiles || /bin/true
 db_go
 db_stop
-
-set +e
-
-profiles="$(debconf-show simple-cdd | grep simple-cdd/profiles | cut -d : -f 2 | sed -e 's/,/ /g')"
-
-cd /usr/local/simple-cdd
-
-for p in $profiles ; do
-  echo "Setting up profile: $p"
-  if [ -r "$p.preseed" ]; then
-    echo "debconf preseeding: $p"
-    debconf-set-selections $p.preseed
-  fi
-done