X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fbasefiles%2Fmk-basefile;h=b9b67f5ca18bd18a1487f17f5a084e07d953cdf4;hb=19fcc3931853969ed5aa97897795557d324cae39;hp=6dcd98697341207a714c6d3e72f2f754d2110023;hpb=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;p=automated-distro-installer diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile index 6dcd986..b9b67f5 100755 --- a/fai/config/basefiles/mk-basefile +++ b/fai/config/basefiles/mk-basefile @@ -36,10 +36,11 @@ 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= - +INCLUDE_ETIONA=ifupdown setarch() { @@ -185,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 @@ -219,7 +219,9 @@ prtdists() { SLC7_64 TRUSTY32 TRUSTY64 XENIAL32 XENIAL64 + FLIDAS64 BIONIC64 + ETIONA64 SQUEEZE32 SQUEEZE64 WHEEZY32 WHEEZY64 JESSIE32 JESSIE64 @@ -301,7 +303,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 ;;