From: Ian Kelling <iank@fsf.org>
Date: Sun, 8 Oct 2017 17:30:47 +0000 (-0700)
Subject: remove some cruft to make flidas basefile build
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=6201b20db7c46d78c9c11007c2aaa8d7f1738b6e;p=automated-distro-installer

remove some cruft to make flidas basefile build
---

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index b688a86..36bacba 100755
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -36,9 +36,6 @@ EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
 EXCLUDE_FLIDAS=udhcpc,dibbler-client,info,tasksel,tasksel-data
 EXCLUDE_XENIAL=udhcpc,dibbler-client,info,tasksel,tasksel-data
 
-# we need aptitude in the base file, since users may want to use it for installing packages
-INCLUDE_DEBIAN=aptitude
-
 
 setarch() {
 
@@ -179,7 +176,7 @@ debgeneric() {
 
     check
     if [ -n "$arch" ]; then
-	qemu-debootstrap --arch $arch --exclude=${!exc} --include=${INCLUDE_DEBIAN} $dist $xtmp $mirror
+	qemu-debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror
 	target="${target}_${arch^^}"
     else
 	if [[ $DIST =~ 64 ]]; then
@@ -187,7 +184,7 @@ debgeneric() {
 	else
             arch=i386
 	fi
-	debootstrap --arch $arch --exclude=${!exc} --include=${INCLUDE_DEBIAN} $dist $xtmp $mirror
+	debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror
     fi
     cleanup-deb
     tarit