various fixes

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

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index b93831ca3493a506c1040149a1b32e2dfd1b2a29..5e8a87b1e7124882035f9c59ffad1fb8a30eb841 100755 (executable)
--- 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
@@ -22,6 +22,7 @@
 # For the first stage, set the CentOS/SLC mirror in /etc/rinse/rinse.conf
 MIRROR_DEBIAN=http://deb.debian.org/debian/
 MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/
+MIRROR_TRISQUEL=http://mirror.fsf.org/trisquel/
 MIRROR_CENTOS=http://mirror.netcologne.de/
 
 EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info,tasksel,tasksel-data
@@ -30,12 +31,11 @@ EXCLUDE_JESSIE=info,tasksel,tasksel-data
 EXCLUDE_STRETCH=info,tasksel,tasksel-data
 EXCLUDE_BUSTER=tasksel,tasksel-data
 
+EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
 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() {
 
@@ -176,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
@@ -184,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
@@ -279,6 +279,8 @@ case "$target" in
     SLC6_32) slc i386 6 ;;
     SLC6_64) slc amd64 6 ;;
     SLC7_64) slc amd64 7 ;;
+    BELENOS*|FLIDAS*)
+        debgeneric $target $MIRROR_TRISQUEL ;;
     TRUSTY*|XENIAL*)
         debgeneric $target $MIRROR_UBUNTU ;;
     SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*)