changes for trisquel 9

[automated-distro-installer] / fai / config / basefiles / mk-basefile

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 152392d5b17c0bc1a59703736627168a6699c361..b9b67f5ca18bd18a1487f17f5a084e07d953cdf4 100755 (executable)
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -1,5 +1,4 @@
 #! /bin/bash
-set -x
 # mk-basefile, create basefiles for some distributions
 #
 # Thomas Lange, Uni Koeln, 2011-2018
@@ -41,7 +40,7 @@ EXCLUDE_ETIONA=udhcpc,dibbler-client,info
 
 # here you can add packages, that are needed very early
 INCLUDE_DEBIAN=
-
+INCLUDE_ETIONA=ifupdown
 
 setarch() {
 
@@ -187,12 +186,11 @@ 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 ${exc} $inc $dist $xtmp $mirror