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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Thu Nov 25 20:50:35 2004
New Revision: 255

Modified:
   people/vagrant/simple-cdd/build-simple-cdd
   people/vagrant/simple-cdd/simple-cdd-profiles
Log:
use relative path, don't include trailing comma in debconf choices


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 20:50:35 2004
@@ -129,7 +129,11 @@
 
 # populate the choices file.
 for p in $profiles ; do
-  choices="$p,$choices"
+  if [ -z "$choices" ]; then
+    choices="$p"
+  else
+    choices="$choices,$p"
+  fi
 done
 
 cat $simple_cdd_dir/simple-cdd.templates | sed s/CHOICES/$choices/g | sed -e 's/,/, /g' > $extras_dir/simple-cdd.templates

Modified: people/vagrant/simple-cdd/simple-cdd-profiles
==============================================================================
--- people/vagrant/simple-cdd/simple-cdd-profiles	(original)
+++ people/vagrant/simple-cdd/simple-cdd-profiles	Thu Nov 25 20:50:35 2004
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-debconf-loadtemplate simple-cdd /usr/local/simple-cdd/simple-cdd.templates
+cd /usr/local/simple-cdd
+
+debconf-loadtemplate simple-cdd simple-cdd.templates
 
 # load debconf
 . /usr/share/debconf/confmodule
@@ -12,10 +14,9 @@
 profiles=$(echo $RET | sed -e 's/,/ /g')
 db_stop
 
-cd /usr/local/simple-cdd
 for p in $profiles ; do
   if [ -r "$p.preseed" ]; then
-    debconf-set-selections /usr/local/simple-cdd/$p.preseed
+    debconf-set-selections $p.preseed
   fi
   if [ -r "$p.packages" ]; then
     apt-get -yu install "$(egrep -v ^# $p.packages)"