Add path when sourcing CONF.sh for compatibility with dash
Spotted by Ian Campbell.
This commit is contained in:
parent
276bf8f8ac
commit
45ae0b76bc
2
build.sh
2
build.sh
|
@ -3,7 +3,7 @@
|
|||
# Script to build images for one or more architectures and/or source
|
||||
|
||||
if [ -z "$CF" ] ; then
|
||||
CF=CONF.sh
|
||||
CF=./CONF.sh
|
||||
fi
|
||||
. $CF
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Script to build everything possible : sources and binaries for all archs
|
||||
|
||||
if [ -z "$CF" ] ; then
|
||||
CF=CONF.sh
|
||||
CF=./CONF.sh
|
||||
fi
|
||||
. $CF
|
||||
|
||||
|
|
|
@ -12,6 +12,8 @@ debian-cd (3.1.3) UNRELEASED; urgency=low
|
|||
bootable. Avoids downloading x86 D-I images for all 30+ CDs in a full set.
|
||||
* Don't download floppy D-I images for i386; they're no longer available.
|
||||
* Don't fetch D-I images for the prep subarchitecture; it is not available.
|
||||
* Add path when sourcing CONF.sh for compatibility with dash. Spotted by
|
||||
Ian Campbell.
|
||||
|
||||
[ Steve McIntyre ]
|
||||
* Remove bashism in tools/apt-selection. Closes: #530972
|
||||
|
|
|
@ -11,7 +11,7 @@ show_usage() {
|
|||
|
||||
|
||||
# Set configuration file to be used for the build and source it
|
||||
export CF=CONF.sh
|
||||
export CF=./CONF.sh
|
||||
. $CF
|
||||
export DEBIAN_CD_CONF_SOURCED=true
|
||||
unset UPDATE_LOCAL
|
||||
|
|
Loading…
Reference in New Issue