Merge branch 'upstream'

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

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 4037d094f09cf211d87f05dd7bae481031cb4317..6dcd98697341207a714c6d3e72f2f754d2110023 100755 (executable)
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -184,6 +184,7 @@ debgeneric() {
 
     dist=${DIST%%[0-9][0-9]}
     local exc="EXCLUDE_$dist"
+    [ -n "${!exc}" ] && exc="--exclude=${!exc}" || unset exc
     dist=${dist,,}
 
     check
@@ -192,7 +193,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 +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