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

[Vagrant Cascadian]

Author: vagrant-guest
Date: Sun Nov 28 13:45:27 2004
New Revision: 282

Modified:
   people/vagrant/simple-cdd/build-simple-cdd
   people/vagrant/simple-cdd/qemu-test
Log:
set defaults before reading conf file, backup extras directory after creating it.


Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Sun Nov 28 13:45:27 2004
@@ -127,14 +127,14 @@
 echo simple-cdd: packages
 make packages
 
+extras_dir="$simple_cdd_dir/extras/simple-cdd"
+mkdir -p $extras_dir
+
 # make a backup of the extras directory, just in case
 echo "backing up $simple_cdd_dir/extras/: old.extras.tgz"
 tar cvpf $simple_cdd_dir/old.extras.tgz $simple_cdd_dir/extras/
 rm -rf $simple_cdd_dir/extras/
 
-extras_dir="$simple_cdd_dir/extras/simple-cdd"
-mkdir -p $extras_dir
-
 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/qemu-test
==============================================================================
--- people/vagrant/simple-cdd/qemu-test	(original)
+++ people/vagrant/simple-cdd/qemu-test	Sun Nov 28 13:45:27 2004
@@ -9,12 +9,13 @@
 
 . CONF.sh
 
-test "-r" qemu-test.conf && . qemu-test.conf
-
+# set some defaults
 hd_img=$HOME/nobackup/qemu.hd.img
 cd_img=$OUT/sarge-i386-1.raw
 mem=96
 
+test "-r" qemu-test.conf && . qemu-test.conf
+
 qemu_opts="-nographic -user-net"
 
 if [ -n "$mem" ]; then