X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fbasefiles%2Fmk-basefile;h=6dcd98697341207a714c6d3e72f2f754d2110023;hb=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;hp=89360bd70da421818e48dddaa5db5a5f5b440220;hpb=11a2db1a576e78f58af7f1e7e4c83422635b630d;p=automated-distro-installer diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile index 89360bd..6dcd986 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 @@ -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