Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* CONF.sh: add non-invasive option to avoid sourcing CONF.sh twice when 

using wrapper scripts.
This commit is contained in:
Frans Pop 2007-12-11 21:43:30 +00:00
parent 66c813bb6a
commit 808cc88159
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONF.sh
View File

@ -1,6 +1,16 @@
#
# This file will have to be sourced where needed
#
# To prevent sourcing this file twice when using scripts to build CD images,
# use the following code at the top of your script:
# CF=CONF.sh
# . $CF
# export DEBIAN_CD_CONF_SOURCED=true
# Allow to prevent double sourcing of this file
if [ "$DEBIAN_CD_CONF_SOURCED" = true ]; then
return 0
fi
# Unset all optional variables first to start from a clean state
unset NONFREE || true

17
debian/CONF.sh vendored
View File

@ -1,6 +1,16 @@
#
# This file will have to be sourced where needed
#
# To prevent sourcing this file twice when using scripts to build CD images,
# use the following code at the top of your script:
# CF=CONF.sh
# . $CF
# export DEBIAN_CD_CONF_SOURCED=true
# Allow to prevent double sourcing of this file
if [ "$DEBIAN_CD_CONF_SOURCED" = true ]; then
return 0
fi
# Unset all optional variables first to start from a clean state
unset NONFREE || true
@ -266,11 +276,14 @@ done
# File with list of packages to exclude as above.
#export BASE_EXCLUDE="$BASEDIR"/data/$CODENAME/base_exclude
# Only put the installer onto the cd (set NORECOMMENDS,... as well).
# Only put the installer onto the cd (set NORECOMMENDS,... as well,
# and if you're not using build.sh then also make sure you set TASK
# appropriately here)
# INSTALLER_CD=0: nothing special (default)
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME)
# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME)
#export INSTALLER_CD=2
#export TASK=tasks/debian-installer+kernel-$CODENAME
# Parameters to pass to kernel (or d-i) when the CD boots. Not currently
# supported for all architectures.

4
debian/changelog vendored
View File

@ -48,8 +48,10 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
[ Frans Pop ]
* build_all.sh: don't source CONF.sh after already sourcing $CF earlier.
* CONF.sh: add non-invasive option to avoid sourcing CONF.sh twice when
using wrapper scripts.
-- Frans Pop <fjp@debian.org> Tue, 11 Dec 2007 22:25:46 +0100
-- Frans Pop <fjp@debian.org> Tue, 11 Dec 2007 22:39:44 +0100
debian-cd (3.0.3) unstable; urgency=low