CONF.sh updates

- change default CODENAME to lenny
- change example paths to mirror to /srv/mirror instead of /mirror
This commit is contained in:
Frans Pop 2008-10-14 08:40:58 +00:00
parent 70b6589065
commit ef7069ec7a
3 changed files with 14 additions and 12 deletions

12
CONF.sh
View File

@ -54,8 +54,8 @@ unset OMIT_DOC_TOOLS || true
# Where I am (hoping I'm in the debian-cd dir) # Where I am (hoping I'm in the debian-cd dir)
export BASEDIR=`pwd` export BASEDIR=`pwd`
# Building etch cd set ... # Building lenny cd set ...
export CODENAME=etch export CODENAME=lenny
# By default use Debian installer packages from $CODENAME # By default use Debian installer packages from $CODENAME
if [ -z "$DI_CODENAME" ]; then if [ -z "$DI_CODENAME" ]; then
@ -102,17 +102,17 @@ fi
# images, however. Also, if you are using an NFS partition for # images, however. Also, if you are using an NFS partition for
# some part of this, you must use this option. # some part of this, you must use this option.
# Paths to the mirrors # Paths to the mirrors
export MIRROR=/mirror/debian export MIRROR=/srv/mirror/debian
# Path of the temporary directory # Path of the temporary directory
export TDIR=/mirror/tmp export TDIR=/srv/mirror/tmp
# Path where the images will be written # Path where the images will be written
export OUT=/mirror/debian-cd-test export OUT=/srv/mirror/debian-cd-test
# Where we keep the temporary apt stuff. # Where we keep the temporary apt stuff.
# This cannot reside on an NFS mount. # This cannot reside on an NFS mount.
export APTTMP=/mirror/tmp/apt export APTTMP=/srv/mirror/tmp/apt
# Do I want to have NONFREE merged in the CD set # Do I want to have NONFREE merged in the CD set
# export NONFREE=1 # export NONFREE=1

12
debian/CONF.sh vendored
View File

@ -54,8 +54,8 @@ unset OMIT_DOC_TOOLS || true
# Where I am (hoping I'm in the debian-cd dir) # Where I am (hoping I'm in the debian-cd dir)
export BASEDIR=`pwd` export BASEDIR=`pwd`
# Building etch cd set ... # Building lenny cd set ...
export CODENAME=etch export CODENAME=lenny
# By default use Debian installer packages from $CODENAME # By default use Debian installer packages from $CODENAME
if [ -z "$DI_CODENAME" ]; then if [ -z "$DI_CODENAME" ]; then
@ -102,17 +102,17 @@ fi
# images, however. Also, if you are using an NFS partition for # images, however. Also, if you are using an NFS partition for
# some part of this, you must use this option. # some part of this, you must use this option.
# Paths to the mirrors # Paths to the mirrors
export MIRROR=/mirror/debian export MIRROR=/srv/mirror/debian
# Path of the temporary directory # Path of the temporary directory
export TDIR=/mirror/tmp export TDIR=/srv/mirror/tmp
# Path where the images will be written # Path where the images will be written
export OUT=/mirror/debian-cd-test export OUT=/srv/mirror/debian-cd-test
# Where we keep the temporary apt stuff. # Where we keep the temporary apt stuff.
# This cannot reside on an NFS mount. # This cannot reside on an NFS mount.
export APTTMP=/mirror/tmp/apt export APTTMP=/srv/mirror/tmp/apt
# Do I want to have NONFREE merged in the CD set # Do I want to have NONFREE merged in the CD set
# export NONFREE=1 # export NONFREE=1

2
debian/changelog vendored
View File

@ -120,6 +120,8 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
D-I images. D-I images.
* Add easy-build.sh, a wrapper script for building images that takes care * Add easy-build.sh, a wrapper script for building images that takes care
of a lot of the gotchas that can make debian-cd hard to use. of a lot of the gotchas that can make debian-cd hard to use.
* CONF.sh: change default CODENAME to lenny; change example paths to mirror
to /srv/mirror.
-- Frans Pop <fjp@debian.org> Tue, 14 Oct 2008 10:01:20 +0200 -- Frans Pop <fjp@debian.org> Tue, 14 Oct 2008 10:01:20 +0200