[Debian-NP-Commits] r294 - people/vagrant/simple-cdd
Vagrant Cascadian
debian-np-devel@lists.alioth.debian.org
Wed, 01 Dec 2004 13:10:20 -0700
Author: vagrant-guest
Date: Wed Dec 1 13:09:44 2004
New Revision: 294
Modified:
people/vagrant/simple-cdd/CONF.sh
people/vagrant/simple-cdd/build-simple-cdd
Log:
generate debpartial-mirror.conf file in temp dir too.
Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh (original)
+++ people/vagrant/simple-cdd/CONF.sh Wed Dec 1 13:09:44 2004
@@ -56,6 +56,10 @@
# list of packages to mirror
all_packages=""
+# debian-cd temporary directories
+export TDIR=$simple_cdd_dir/tmp/
+export APTTMP=$simple_cdd_dir/tmp/apt/
+
## debpartial-mirror values ##
# call debpartial-mirror at each build- defaults to true.
@@ -79,12 +83,11 @@
# debpartial-mirror server variable
debpartial_debian_mirror="http://ftp.us.debian.org/debian/"
+# location of generated debpartial-mirror configuration file
+debpartial_conf="$TDIR/debpartial-mirror.conf"
-## values used by both debpartial-mirror and debian-cd ##
-# debian-cd temporary directories
-export TDIR=$simple_cdd_dir/tmp/
-export APTTMP=$simple_cdd_dir/tmp/apt/
+## values used by both debpartial-mirror and debian-cd ##
# directory of debian mirror, used by both debpartial-mirror and debian-cd
export MIRROR=$simple_cdd_dir/mirror/
Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd (original)
+++ people/vagrant/simple-cdd/build-simple-cdd Wed Dec 1 13:09:44 2004
@@ -66,7 +66,7 @@
sort -u $TASK.cache >> $TASK
if [ -z "$do_mirror" ] || [ "$do_mirror" = "true" ] ; then
- debpartial_conf=debpartial-mirror.conf
+ test -z "$debpartial_conf" && debpartial_conf=debpartial-mirror.conf
test -r "$debpartial_conf" && cp -f $debpartial_conf $debpartial_conf.bak
# generate debpartial-mirror.conf