[Debian-NP-Commits] r244 - people/vagrant/simple-cdd
Vagrant Cascadian
debian-np-devel@lists.alioth.debian.org
Thu, 25 Nov 2004 14:51:12 -0700
Author: vagrant-guest
Date: Thu Nov 25 14:50:46 2004
New Revision: 244
Modified:
people/vagrant/simple-cdd/CONF.sh
people/vagrant/simple-cdd/README
people/vagrant/simple-cdd/build-simple-cdd
Log:
reorganized configuration file, renamed variables.
Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh (original)
+++ people/vagrant/simple-cdd/CONF.sh Thu Nov 25 14:50:46 2004
@@ -1,16 +1,14 @@
-#
-# This file will have to be sourced where needed
-#
-
# see /usr/share/debian-cd/CONF.sh to get a more complete list and description
# of available variables
+# variables in lowercase are only used by simple-cdd.
+
# path to simple-cdd files
-simple_cdd_path=$(pwd)
+simple_cdd_dir=$(pwd)
# location of debian-cd files
debian_cd_dir=/usr/share/debian-cd
-#debian_cd_dir=$simple_cdd_path/debian-cd
+#debian_cd_dir=$simple_cdd_dir/debian-cd
# get default values for most things
. $debian_cd_dir/CONF.sh
@@ -21,15 +19,11 @@
unset $var || true
done
+# where debian-cd expects to find itself :)
export BASEDIR=$debian_cd_dir
-export MIRROR=$simple_cdd_path/mirror/
-export TDIR=$simple_cdd_path/tmp/
-export OUT=$simple_cdd_path/images/
-export APTTMP=$simple_cdd_path/tmp/apt/
-export CONTRIB=0
-export MAXCDS=1
-export TASK=$simple_cdd_path/simple-cdd.task
-export INSTALLER_CD=2
+
+# kernel parameters passed to the CD bootloader.
+# works with isolinux on i386.
export KERNEL_PARAMS="preseed/file=/cdrom/simple-cdd/default.preseed"
# preselect language and country settings.
#export KERNEL_PARAMS="preseed/file=/cdrom/simple-cdd/default.preseed languagechooser/language-name=English countrychooser/shortlist=US"
@@ -38,31 +32,63 @@
# debconf-set-selections)
preseed_files=""
-# increase the size limit if debian-cd tries to make more CDs than you
-# want, and the generated CDs are smaller than 650MB.
-export SIZELIMIT=739631360
-
-# these are generally debian-cd files which should get included
-includes="$BASEDIR/tasks/debian-installer+kernel $BASEDIR/tasks/debian-installer $BASEDIR/tasks/base-$CODENAME"
-
# files which contain lists of packages
package_files="simple-cdd-packages.list simple-cdd-downloads.list"
# list of packages to mirror
all_packages=""
+
+## debpartial-mirror values ##
+
+# use a proxy (FIXME: does debpartial-mirror pay attention to proxy?)
#export http_proxy=http://localhost:3128
-# download a specific codename branch, such as sid.
-use_di_codename="$CODENAME"
+# download a specific codename branch, such as sid, sarge, or etch.
+di_codename="$CODENAME"
# download a specific installer release, such as 20041118 or rc2
-use_di_release="current"
+di_release="current"
-debian_installer_dir="dists/$use_di_codename/main/installer-$ARCH/$use_di_release/"
+# directory for debpartial-mirror to download debian-installer from
+debian_installer_dir="dists/$di_codename/main/installer-$ARCH/$di_release/"
# debpartial-mirror.conf files variable
debpartial_files="README doc/ tools/ indices/ $debian_installer_dir"
# debpartial-mirror server variable
debpartial_debian_mirror="http://ftp.us.debian.org/debian/"
+
+
+## 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/
+
+# location of generated task file, used by debian-cd and debpartial-mirror
+export TASK=$simple_cdd_dir/simple-cdd.task
+
+# these are generally debian-cd files which should get included in the task file
+includes="$BASEDIR/tasks/debian-installer+kernel $BASEDIR/tasks/debian-installer $BASEDIR/tasks/base-$CODENAME"
+
+## More debian-cd options ##
+
+# location where generated CD image(s) will be put
+export OUT=$simple_cdd_dir/images/
+
+# debian-cd temporary directories
+export TDIR=$simple_cdd_dir/tmp/
+export APTTMP=$simple_cdd_dir/tmp/apt/
+
+# increase the size limit if debian-cd tries to make more CDs than you
+# want, and the generated CDs are smaller than 650MB.
+export SIZELIMIT=739631360
+
+# don't include contrib
+export CONTRIB=0
+
+# only generate one CD
+export MAXCDS=1
+
+# FIXME: what does this do?
+export INSTALLER_CD=2
Modified: people/vagrant/simple-cdd/README
==============================================================================
--- people/vagrant/simple-cdd/README (original)
+++ people/vagrant/simple-cdd/README Thu Nov 25 14:50:46 2004
@@ -66,7 +66,7 @@
has not yet fully migrated to rc2(not all mirrors have updated as of 20041124),
in CONF.sh edit:
-use_di_codename="sid", or use_di_release="rc2", or use_di_release="20041118"
+di_codename="sid", or di_release="rc2", or di_release="20041118"
Build the CD
@@ -100,7 +100,7 @@
and make a few changes in CONF.sh:
-debian_cd_dir=$simple_cdd_path/debian-cd
+debian_cd_dir=$simple_cdd_dir/debian-cd
KERNEL_PARAMS="preseed/file=/cdrom/simple-cdd/default.preseed console=ttyS0,38400"
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 14:50:46 2004
@@ -5,10 +5,10 @@
. CONF.sh
-mkdir -p "$simple_cdd_path"
+mkdir -p "$simple_cdd_dir"
-if [ ! -d "$simple_cdd_path" ] ; then
- echo "ERROR: directory not found: $simple_cdd_path"
+if [ ! -d "$simple_cdd_dir" ] ; then
+ echo "ERROR: directory not found: $simple_cdd_dir"
exit 1
fi
@@ -72,11 +72,11 @@
exit 1
fi
-if [ "$use_di_release" != "current" ] || [ "$use_di_codename" != "$CODENAME" ]; then
+if [ "$di_release" != "current" ] || [ "$di_codename" != "$CODENAME" ]; then
cd $MIRROR/dists
- echo "WARNING: using installer from: $use_di_codename $use_di_release"
+ echo "WARNING: using installer from: $di_codename $di_release"
mkdir -p $CODENAME/main/installer-i386/current
- rsync --delete -aWHr $use_di_codename/main/installer-i386/$use_di_release/. $CODENAME/main/installer-i386/current/
+ rsync --delete -aWHr $di_codename/main/installer-i386/$di_release/. $CODENAME/main/installer-i386/current/
fi
cd $BASEDIR
@@ -96,17 +96,17 @@
echo simple-cdd: packages
make packages
-mkdir -p $simple_cdd_path/extras/simple-cdd
-cp -f $simple_cdd_path/default.preseed $simple_cdd_path/extras/simple-cdd/
-cp -f $simple_cdd_path/simple-cdd-packages.list $simple_cdd_path/extras/simple-cdd/
+mkdir -p $simple_cdd_dir/extras/simple-cdd
+cp -f $simple_cdd_dir/default.preseed $simple_cdd_dir/extras/simple-cdd/
+cp -f $simple_cdd_dir/simple-cdd-packages.list $simple_cdd_dir/extras/simple-cdd/
# TODO modify default.preseed to include other files
for a in $preseed_files ; do
- cat $a >> $simple_cdd_path/extras/simple-cdd/default.preseed
+ cat $a >> $simple_cdd_dir/extras/simple-cdd/default.preseed
done
echo simple-cdd: extra files for simple-cdd
-make bin-extras CD=1 ROOTSRC=$simple_cdd_path/extras DIR=.
+make bin-extras CD=1 ROOTSRC=$simple_cdd_dir/extras DIR=.
echo simple-cdd: bin-image
make bin-image CD=1