X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fbasefiles%2Fmk-basefile;h=5e8a87b1e7124882035f9c59ffad1fb8a30eb841;hp=b688a865e985d5a18186c8c7200f1782859957e0;hb=05e47f6734e5a9354a3243686ae55fe4ab2b72c7;hpb=e6c8a36522847eca91819ab3eb656dd824bc3e3c diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile index b688a86..5e8a87b 100755 --- a/fai/config/basefiles/mk-basefile +++ b/fai/config/basefiles/mk-basefile @@ -1,5 +1,5 @@ #! /bin/bash - +set -x # mk-basefile, create basefiles for some distributions # # Thomas Lange, Uni Koeln, 2011-2017 @@ -36,9 +36,6 @@ EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info EXCLUDE_FLIDAS=udhcpc,dibbler-client,info,tasksel,tasksel-data EXCLUDE_XENIAL=udhcpc,dibbler-client,info,tasksel,tasksel-data -# we need aptitude in the base file, since users may want to use it for installing packages -INCLUDE_DEBIAN=aptitude - setarch() { @@ -179,7 +176,7 @@ debgeneric() { check if [ -n "$arch" ]; then - qemu-debootstrap --arch $arch --exclude=${!exc} --include=${INCLUDE_DEBIAN} $dist $xtmp $mirror + qemu-debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror target="${target}_${arch^^}" else if [[ $DIST =~ 64 ]]; then @@ -187,7 +184,7 @@ debgeneric() { else arch=i386 fi - debootstrap --arch $arch --exclude=${!exc} --include=${INCLUDE_DEBIAN} $dist $xtmp $mirror + debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror fi cleanup-deb tarit