From 287f09fde0c3bfdf7956d23a9fff9f0848fd976a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 25 Oct 2016 14:46:12 +0200 Subject: Switching from ftp.debian.org as default debian mirror to deb.debian.org in debconf script. deb.debian.org offers https, see https://lists.debian.org/debian-devel/2016/10/msg00281.html Signed-off-by: Daniel Baumann --- share/scripts/debconf | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'share/scripts/debconf') diff --git a/share/scripts/debconf b/share/scripts/debconf index ba73050..2b3563c 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -227,19 +227,27 @@ Debootstrap () { DIRECTORY="${1}" + INCLUDE="dbus" + + if echo "${MIRROR}" | grep -qs '^https' || \ + echo "{PARENT_MIRROR}" | grep -qs '^https' + then + INCLUDE="${INCLUDE},apt-transport-https,ca-certificates" + fi + # FIXME: trim down, debootstrap variants? case "${MODE}" in debian) - INCLUDE="--include=ifupdown,locales,libui-dialog-perl,dialog,isc-dhcp-client,netbase,net-tools,iproute,wget" + INCLUDE="${INCLUDE},ifupdown,locales,libui-dialog-perl,dialog,isc-dhcp-client,netbase,net-tools,iproute,wget" ;; progress-linux) - INCLUDE="--include=apt-transport-https,ca-certificates,apt-utils,ifupdown,locales-all,libui-dialog-perl,dialog,isc-dhcp-client,netbase,net-tools,iproute,openssh-server,wget" + INCLUDE="${INCLUDE},apt-utils,ifupdown,locales-all,libui-dialog-perl,dialog,isc-dhcp-client,netbase,net-tools,iproute,openssh-server,wget" ;; esac mkdir -p "$(dirname ${DIRECTORY})" - debootstrap --verbose --arch=${ARCHITECTURE} --components=${PARENT_ARCHIVE_AREAS} ${INCLUDE} \ + debootstrap --verbose --arch=${ARCHITECTURE} --components=${PARENT_ARCHIVE_AREAS} --include=${INCLUDE} \ ${PARENT_DISTRIBUTION} "${DIRECTORY}" ${PARENT_MIRROR} } -- cgit v1.2.3