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

Make setting $WGET_OPTS conditional. 

Only export WGET_OPTS="--ca-directory /etc/ssl/ca-debian/" when this
directory actually exists, making it easier to use debian-cd on non-
debian.org machines.
This commit is contained in:
Cyril Brulebois 2016-05-12 12:23:18 +02:00
parent 9cc53e76f4
commit 1cf9160af7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONF.sh
View File

@ -412,7 +412,9 @@ esac
# Add options to wget to include support for the Debian CA, so
# https://d-i.debian.org et al will work.
export WGET_OPTS="--ca-directory /etc/ssl/ca-debian/"
if [ -d "/etc/ssl/ca-debian" ]; then
export WGET_OPTS="--ca-directory /etc/ssl/ca-debian/"
fi
export WGET="wget $WGET_OPTS"
# Set this to force the Release file(s) to say "stable". Used in first

5
debian/changelog vendored
View File

@ -4,6 +4,11 @@ debian-cd (3.1.19) UNRELEASED; urgency=medium
* Also fix size calculation for EFI image for arm64
* Add workaround for dosfstools issue (#823881)
[ Cyril Brulebois ]
* Only export WGET_OPTS="--ca-directory /etc/ssl/ca-debian/" when this
directory actually exists, making it easier to use debian-cd on non-
debian.org machines.
-- Steve McIntyre <93sam@debian.org> Fri, 06 May 2016 22:59:32 +0100
debian-cd (3.1.18) unstable; urgency=medium