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 5e8a87b1e7124882035f9c59ffad1fb8a30eb841..ccfd3677ec218fb7086eec123a33d7e6a2adc3ba 100755 (executable)
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -102,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 \
@@ -226,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
@@ -241,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 ;;
@@ -252,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