upstream 00f2ea2b8 as of 2018-09-02

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

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index b93831ca3493a506c1040149a1b32e2dfd1b2a29..2fc0d2ace513f27ed08439c51521585a099ff107 100755 (executable)
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -2,7 +2,7 @@
 
 # mk-basefile, create basefiles for some distributions
 #
-# Thomas Lange, Uni Koeln, 2011-2017
+# Thomas Lange, Uni Koeln, 2011-2018
 # based on the Makefile implementation of Michael Goetze
 #
 # Usage example: mk-basefile -J STRETCH64
@@ -24,17 +24,19 @@ MIRROR_DEBIAN=http://deb.debian.org/debian/
 MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/
 MIRROR_CENTOS=http://mirror.netcologne.de/
 
-EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info,tasksel,tasksel-data
-EXCLUDE_WHEEZY=info,tasksel,tasksel-data
-EXCLUDE_JESSIE=info,tasksel,tasksel-data
-EXCLUDE_STRETCH=info,tasksel,tasksel-data
-EXCLUDE_BUSTER=tasksel,tasksel-data
+EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info
+EXCLUDE_WHEEZY=info
+EXCLUDE_JESSIE=info
+EXCLUDE_STRETCH=info
+EXCLUDE_BUSTER=
+EXCLUDE_SID=
 
 EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
-EXCLUDE_XENIAL=udhcpc,dibbler-client,info,tasksel,tasksel-data
+EXCLUDE_XENIAL=udhcpc,dibbler-client,info
+EXCLUDE_BIONIC=udhcpc,dibbler-client,info
 
-# we need aptitude in the base file, since users may want to use it for installing packages
-INCLUDE_DEBIAN=aptitude
+# here you can add packages, that are needed very early
+INCLUDE_DEBIAN=
 
 
 setarch() {
@@ -175,8 +177,12 @@ debgeneric() {
     dist=${dist,,}
 
     check
+    if [ -n "$INCLUDE_DEBIAN" ]; then
+       local inc="--include=$INCLUDE_DEBIAN"
+    fi
+
     if [ -n "$arch" ]; then
-       qemu-debootstrap --arch $arch --exclude=${!exc} --include=${INCLUDE_DEBIAN} $dist $xtmp $mirror
+       qemu-debootstrap --arch $arch --exclude=${!exc} $inc $dist $xtmp $mirror
        target="${target}_${arch^^}"
     else
        if [[ $DIST =~ 64 ]]; then
@@ -184,7 +190,7 @@ debgeneric() {
        else
             arch=i386
        fi
-       debootstrap --arch $arch --exclude=${!exc} --include=${INCLUDE_DEBIAN} $dist $xtmp $mirror
+       debootstrap --arch $arch --exclude=${!exc} $inc $dist $xtmp $mirror
     fi
     cleanup-deb
     tarit
@@ -202,11 +208,13 @@ prtdists() {
                  SLC7_64
     TRUSTY32     TRUSTY64
     XENIAL32     XENIAL64
+                 BIONIC64
     SQUEEZE32    SQUEEZE64
     WHEEZY32     WHEEZY64
     JESSIE32     JESSIE64
     STRETCH32    STRETCH64
     BUSTER32     BUSTER64
+    SID32        SID64
 "
 }
 
@@ -215,12 +223,11 @@ usage() {
     cat <<EOF
 mk-basefile, create minimal base files for a Linux distritubtion
 
-   Copyright (C) 2011-2017 by Thomas Lange
+   Copyright (C) 2011-2018 by Thomas Lange
 
 Usage: mk-basefile [OPTION] ... DISTRIBUTION
 
    -s                   Show list of supported linux distributions
-   -a                   Add xtattrs, acl and selinux properties to the tar file.
    -f ARCH              Build for foreign architecture ARCH.
    -d DIR               Use DIR for creating the temporary subtree structure.
    -z                   Use gzip for compressing the tar file.
@@ -241,10 +248,11 @@ ext=tar
 zip=cat
 attributes=
 cleanup=1
+attributes="--xattrs --selinux --acls"
 
 while getopts ashzJd:kf: opt ; do
     case "$opt" in
-        a) attributes="--xattrs --selinux --acl" ;;
+        a) echo "$0: Warning. -a is ignored, because xtattrs, acls and selinux are always added." ;;
         d) export TMPDIR=$OPTARG ;;
         f) export ARCH=$OPTARG ;;
         z) zip="gzip -9"; ext=tar.gz ;;
@@ -279,9 +287,9 @@ case "$target" in
     SLC6_32) slc i386 6 ;;
     SLC6_64) slc amd64 6 ;;
     SLC7_64) slc amd64 7 ;;
-    TRUSTY*|XENIAL*)
+    TRUSTY*|XENIAL*|BIONIC*)
         debgeneric $target $MIRROR_UBUNTU ;;
-    SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*)
+    SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*|SID*)
         debgeneric $target $MIRROR_DEBIAN $ARCH;;
     *) echo "Unknown distribution. Aborting."
        prtdists