X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fbasefiles%2Fmk-basefile;h=152392d5b17c0bc1a59703736627168a6699c361;hb=ee37d990c89bb3bab1b54e3b3fb43e9f79ed039b;hp=4037d094f09cf211d87f05dd7bae481031cb4317;hpb=0b8eb4a3e41e6fd69f5da44f733b887eb5ed9f33;p=automated-distro-installer

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 4037d09..152392d 100755
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -x
 # mk-basefile, create basefiles for some distributions
 #
 # Thomas Lange, Uni Koeln, 2011-2018
@@ -36,6 +37,7 @@ 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=
@@ -184,6 +186,7 @@ debgeneric() {
 
     dist=${DIST%%[0-9][0-9]}
     local exc="EXCLUDE_$dist"
+    [ -n "${!exc}" ] && exc="--exclude=${!exc}" || unset exc
     dist=${dist,,}
 
     check
@@ -192,7 +195,7 @@ debgeneric() {
     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 +203,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 +221,9 @@ prtdists() {
                  SLC7_64
     TRUSTY32     TRUSTY64
     XENIAL32     XENIAL64
+                 FLIDAS64
                  BIONIC64
+                 ETIONA64
     SQUEEZE32    SQUEEZE64
     WHEEZY32     WHEEZY64
     JESSIE32     JESSIE64
@@ -300,7 +305,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 ;;