From e04b19fabe52697812f9f8ef1f81c02034a7680a Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 29 Nov 2018 09:08:13 +0100 Subject: [PATCH] [ deboostrap bugfix ] adding universe component to resolve installing apt-transport-https in 1st stage. Now all targets are working, --- lib/configuration.sh | 4 ++++ lib/debootstrap-ng.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/configuration.sh b/lib/configuration.sh index 6377c39fd..03accbd38 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -175,24 +175,28 @@ esac case $RELEASE in jessie) + DEBOOTSTRAP_COMPONENTS="main" PACKAGE_LIST_RELEASE="less kbd gnupg2 dirmngr" PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless policykit-1-gnome eject numix-icon-theme" PACKAGE_LIST_DESKTOP_RECOMMENDS+=" iceweasel pluma system-config-printer" ;; xenial) + DEBOOTSTRAP_COMPONENTS="main" PACKAGE_LIST_RELEASE="man-db wget nano" PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless paprefs numix-icon-theme" PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium-browser language-selector-gnome system-config-printer-common system-config-printer-gnome" ;; stretch) + DEBOOTSTRAP_COMPONENTS="main" PACKAGE_LIST_RELEASE="man-db less kbd net-tools netcat-openbsd gnupg2 dirmngr" PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless paprefs dbus-x11" PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium system-config-printer-common system-config-printer" ;; bionic) + DEBOOTSTRAP_COMPONENTS="main,universe" PACKAGE_LIST_RELEASE="man-db less kbd net-tools netcat-openbsd gnupg2 dirmngr nano wget" PACKAGE_LIST_DESKTOP+=" xserver-xorg-input-all paprefs dbus-x11" PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium-browser system-config-printer-common system-config-printer language-selector-gnome" diff --git a/lib/debootstrap-ng.sh b/lib/debootstrap-ng.sh index 227ec6121..07fd54501 100644 --- a/lib/debootstrap-ng.sh +++ b/lib/debootstrap-ng.sh @@ -119,7 +119,7 @@ create_rootfs_cache() display_alert "Installing base system" "Stage 1/2" "info" eval 'debootstrap --include=${DEBOOTSTRAP_LIST} ${PACKAGE_LIST_EXCLUDE:+ --exclude=${PACKAGE_LIST_EXCLUDE// /,}} \ - --arch=$ARCH --foreign $RELEASE $SDCARD/ $apt_mirror' \ + --arch=$ARCH --components=${DEBOOTSTRAP_COMPONENTS} --foreign $RELEASE $SDCARD/ $apt_mirror' \ ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \ ${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Debootstrap (stage 1/2)..." $TTY_Y $TTY_X'} \ ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}