X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fbasefiles%2Fmk-basefile;h=b9b67f5ca18bd18a1487f17f5a084e07d953cdf4;hb=19fcc3931853969ed5aa97897795557d324cae39;hp=89360bd70da421818e48dddaa5db5a5f5b440220;hpb=11a2db1a576e78f58af7f1e7e4c83422635b630d;p=automated-distro-installer

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 89360bd..b9b67f5 100755
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -28,7 +28,7 @@ EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info
 EXCLUDE_WHEEZY=info
 EXCLUDE_JESSIE=info
 EXCLUDE_STRETCH=info
-EXCLUDE_BUSTER=
+EXCLUDE_BUSTER=info
 EXCLUDE_SID=
 
 EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
@@ -36,10 +36,11 @@ EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
 EXCLUDE_XENIAL=udhcpc,dibbler-client,info
 EXCLUDE_FLIDAS=udhcpc,dibbler-client,info
 EXCLUDE_BIONIC=udhcpc,dibbler-client,info
+EXCLUDE_ETIONA=udhcpc,dibbler-client,info
 
 # here you can add packages, that are needed very early
 INCLUDE_DEBIAN=
-
+INCLUDE_ETIONA=ifupdown
 
 setarch() {
 
@@ -184,15 +185,15 @@ debgeneric() {
 
     dist=${DIST%%[0-9][0-9]}
     local exc="EXCLUDE_$dist"
+    [ -n "${!exc}" ] && exc="--exclude=${!exc}" || unset exc
+    local inc="INCLUDE_$dist"
+    [ -n "${!inc}" ] && inc="--include=${!inc}" || unset inc
     dist=${dist,,}
 
     check
-    if [ -n "$INCLUDE_DEBIAN" ]; then
-	local inc="--include=$INCLUDE_DEBIAN"
-    fi
 
     if [ -n "$arch" ]; then
-	qemu-debootstrap --arch $arch --exclude=${!exc} $inc $dist $xtmp $mirror
+	qemu-debootstrap --arch $arch ${exc} $inc $dist $xtmp $mirror
 	target="${target}_${arch^^}"
     else
 	if [[ $DIST =~ 64 ]]; then
@@ -200,7 +201,7 @@ debgeneric() {
 	else
             arch=i386
 	fi
-	debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror
+	debootstrap --arch $arch ${exc} $inc $dist $xtmp $mirror
     fi
     cleanup-deb
     tarit
@@ -218,7 +219,9 @@ prtdists() {
                  SLC7_64
     TRUSTY32     TRUSTY64
     XENIAL32     XENIAL64
+                 FLIDAS64
                  BIONIC64
+                 ETIONA64
     SQUEEZE32    SQUEEZE64
     WHEEZY32     WHEEZY64
     JESSIE32     JESSIE64
@@ -300,7 +303,7 @@ case "$target" in
     SLC6_32) slc i386 6 ;;
     SLC6_64) slc amd64 6 ;;
     SLC7_64) slc amd64 7 ;;
-    BELENOS*|FLIDAS*)
+    BELENOS*|FLIDAS*|ETIONA*)
         debgeneric $target $MIRROR_TRISQUEL ;;
     TRUSTY*|XENIAL*|BIONIC*)
         debgeneric $target $MIRROR_UBUNTU ;;