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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Thu Nov 25 18:24:36 2004
New Revision: 250

Modified:
   people/vagrant/simple-cdd/README
   people/vagrant/simple-cdd/build-simple-cdd
Log:
updated doc, put backup tarball in right place, more solid non-standard debian-installer release handling.


Modified: people/vagrant/simple-cdd/README
==============================================================================
--- people/vagrant/simple-cdd/README	(original)
+++ people/vagrant/simple-cdd/README	Thu Nov 25 18:24:36 2004
@@ -8,11 +8,12 @@
 
 Package Selection
 
-edit simple-cdd-packages.list to include all the packages you want
-automatically installed.
+edit default.packages to include all the packages you want automatically
+installed.
 
-edit simple-cdd-downloads.list to include extra packags to include on the CD
-that do not get installed automatically (though debian-installer or tasksel may need or try to install them).
+edit default.downloads to include extra packags on the CD that do not get
+installed automatically (though debian-installer or tasksel may need or try to
+install them).
 
 
 Debconf Preseeding
@@ -28,7 +29,7 @@
 as language and country settings) may have to be passed at the boot prompt(see
 below).
 
-comment out the following question:
+comment out the following question, if present:
 
   base-config    base-config/main-menu
 
@@ -118,5 +119,5 @@
 
 qemu -nographic -hda ~/hd.img -cdrom images/sarge-i386-1.raw -boot c
 
-since grub doesn't pass the console=ttyS,38400 by default, it may take a while
+since grub doesn't pass the console=ttyS0,38400 by default, it may take a while
 for you to see anything.  be patient, and it will eventually show up.

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 18:24:36 2004
@@ -88,11 +88,12 @@
   exit 1
 fi
 
-if [ "$di_release" != "current" ] || [ "$di_codename" != "$CODENAME" ]; then
-  cd $MIRROR/dists
-  echo "WARNING: using installer from: $di_codename $di_release"
-  mkdir -p $CODENAME/main/installer-i386/current
-  rsync --delete -aWHr $di_codename/main/installer-i386/$di_release/. $CODENAME/main/installer-i386/current/
+current_installer="dists/$CODENAME/main/installer-$ARCH/current"
+if [ "$debian_installer_di" != "$current_installer" ]; then
+  echo "WARNING: using installer from: $debian_installer_di"
+  cd $MIRROR
+  mkdir -p $current_installer
+  rsync --delete -aWHr $debian_installer_di/. $current_installer/
 fi
 
 cd $BASEDIR
@@ -113,7 +114,7 @@
 make packages
 
 # make a backup of the extras directory, just in case
-tar cvzpf old.extras.tgz $simple_cdd_dir/extras/
+tar cvzpf $simple_cdd_dir/old.extras.tgz $simple_cdd_dir/extras/
 rm -rf $simple_cdd_dir/extras/
 
 extras_dir="$simple_cdd_dir/extras/simple-cdd"