X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fbasefiles%2Fmk-basefile;h=89360bd70da421818e48dddaa5db5a5f5b440220;hp=2fc0d2ace513f27ed08439c51521585a099ff107;hb=11a2db1a576e78f58af7f1e7e4c83422635b630d;hpb=bc3037fe2075e33b0035fc0689f44a60381638f9

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 2fc0d2a..89360bd 100755
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -1,5 +1,4 @@
 #! /bin/bash
-
 # mk-basefile, create basefiles for some distributions
 #
 # Thomas Lange, Uni Koeln, 2011-2018
@@ -22,6 +21,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
@@ -31,8 +31,10 @@ EXCLUDE_STRETCH=info
 EXCLUDE_BUSTER=
 EXCLUDE_SID=
 
+EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
 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
 
 # here you can add packages, that are needed very early
@@ -104,6 +106,14 @@ EOM
 
 cleanup-deb() {
 
+    if [[ $cmd ]]; then
+        if [[ -e $cmd ]]; then
+            cp "$cmd" $xtmp/tmp
+            chroot $xtmp "/tmp/$cmd"
+        else
+            chroot $xtmp $cmd
+        fi
+    fi
     chroot $xtmp apt-get clean
     rm -f $xtmp/etc/hostname $xtmp/etc/resolv.conf \
           $xtmp/var/lib/apt/lists/*_* $xtmp/usr/bin/qemu-*-static \
@@ -190,7 +200,7 @@ debgeneric() {
 	else
             arch=i386
 	fi
-	debootstrap --arch $arch --exclude=${!exc} $inc $dist $xtmp $mirror
+	debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror
     fi
     cleanup-deb
     tarit
@@ -233,6 +243,8 @@ Usage: mk-basefile [OPTION] ... DISTRIBUTION
    -z                   Use gzip for compressing the tar file.
    -J                   Use xz for compressing the tar file.
    -k                   Keep the temporary subtree structure, do not remove it.
+   -x CMD               Run CMD in chroot. If CMD exists as a file, copy it and run it.
+                        Debian based only
    -h                   Print help.
 
  Usage example: mk-basefile -J STRETCH64
@@ -250,7 +262,7 @@ attributes=
 cleanup=1
 attributes="--xattrs --selinux --acls"
 
-while getopts ashzJd:kf: opt ; do
+while getopts ashzJd:kf:x: opt ; do
     case "$opt" in
         a) echo "$0: Warning. -a is ignored, because xtattrs, acls and selinux are always added." ;;
         d) export TMPDIR=$OPTARG ;;
@@ -260,6 +272,7 @@ while getopts ashzJd:kf: opt ; do
         k) cleanup=0 ;;
         h) usage ;;
         s) prtdists ; exit 0;;
+        x) cmd="$OPTARG" ;;
         ?) exit 3 ;; # error in option parsing
     esac
 done
@@ -287,6 +300,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*|BIONIC*)
         debgeneric $target $MIRROR_UBUNTU ;;
     SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*|SID*)