dirinstall fixes/improvements, other minor changes

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

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index b688a865e985d5a18186c8c7200f1782859957e0..ccfd3677ec218fb7086eec123a33d7e6a2adc3ba 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
@@ -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() {
 
@@ -105,6 +102,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 \
@@ -179,7 +184,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 +192,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
@@ -229,6 +234,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
@@ -244,8 +251,9 @@ ext=tar
 zip=cat
 attributes=
 cleanup=1
+cmd=
 
-while getopts ashzJd:kf: opt ; do
+while getopts ashzJd:kf:x: opt ; do
     case "$opt" in
         a) attributes="--xattrs --selinux --acl" ;;
         d) export TMPDIR=$OPTARG ;;
@@ -255,6 +263,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