iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initial buster support
[automated-distro-installer]
/
fai
/
config
/
basefiles
/
mk-basefile
diff --git
a/fai/config/basefiles/mk-basefile
b/fai/config/basefiles/mk-basefile
index 5e8a87b1e7124882035f9c59ffad1fb8a30eb841..4037d094f09cf211d87f05dd7bae481031cb4317 100755
(executable)
--- a/
fai/config/basefiles/mk-basefile
+++ b/
fai/config/basefiles/mk-basefile
@@
-1,8
+1,7
@@
#! /bin/bash
#! /bin/bash
-set -x
# mk-basefile, create basefiles for some distributions
#
# mk-basefile, create basefiles for some distributions
#
-# Thomas Lange, Uni Koeln, 2011-201
7
+# Thomas Lange, Uni Koeln, 2011-201
8
# based on the Makefile implementation of Michael Goetze
#
# Usage example: mk-basefile -J STRETCH64
# based on the Makefile implementation of Michael Goetze
#
# Usage example: mk-basefile -J STRETCH64
@@
-25,16
+24,21
@@
MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/
MIRROR_TRISQUEL=http://mirror.fsf.org/trisquel/
MIRROR_CENTOS=http://mirror.netcologne.de/
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
-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=info
+EXCLUDE_SID=
EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
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
+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
+INCLUDE_DEBIAN=
setarch() {
setarch() {
@@
-102,6
+106,14
@@
EOM
cleanup-deb() {
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 \
chroot $xtmp apt-get clean
rm -f $xtmp/etc/hostname $xtmp/etc/resolv.conf \
$xtmp/var/lib/apt/lists/*_* $xtmp/usr/bin/qemu-*-static \
@@
-175,8
+187,12
@@
debgeneric() {
dist=${dist,,}
check
dist=${dist,,}
check
+ if [ -n "$INCLUDE_DEBIAN" ]; then
+ local inc="--include=$INCLUDE_DEBIAN"
+ fi
+
if [ -n "$arch" ]; then
if [ -n "$arch" ]; then
- qemu-debootstrap --arch $arch --exclude=${!exc} $dist $xtmp $mirror
+ qemu-debootstrap --arch $arch --exclude=${!exc} $
inc $
dist $xtmp $mirror
target="${target}_${arch^^}"
else
if [[ $DIST =~ 64 ]]; then
target="${target}_${arch^^}"
else
if [[ $DIST =~ 64 ]]; then
@@
-202,11
+218,13
@@
prtdists() {
SLC7_64
TRUSTY32 TRUSTY64
XENIAL32 XENIAL64
SLC7_64
TRUSTY32 TRUSTY64
XENIAL32 XENIAL64
+ BIONIC64
SQUEEZE32 SQUEEZE64
WHEEZY32 WHEEZY64
JESSIE32 JESSIE64
STRETCH32 STRETCH64
BUSTER32 BUSTER64
SQUEEZE32 SQUEEZE64
WHEEZY32 WHEEZY64
JESSIE32 JESSIE64
STRETCH32 STRETCH64
BUSTER32 BUSTER64
+ SID32 SID64
"
}
"
}
@@
-215,17
+233,18
@@
usage() {
cat <<EOF
mk-basefile, create minimal base files for a Linux distritubtion
cat <<EOF
mk-basefile, create minimal base files for a Linux distritubtion
- Copyright (C) 2011-201
7
by Thomas Lange
+ Copyright (C) 2011-201
8
by Thomas Lange
Usage: mk-basefile [OPTION] ... DISTRIBUTION
-s Show list of supported linux distributions
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.
-J Use xz for compressing the tar file.
-k Keep the temporary subtree structure, do not remove it.
-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.
-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
-h Print help.
Usage example: mk-basefile -J STRETCH64
@@
-241,10
+260,11
@@
ext=tar
zip=cat
attributes=
cleanup=1
zip=cat
attributes=
cleanup=1
+attributes="--xattrs --selinux --acls"
-while getopts ashzJd:kf: opt ; do
+while getopts ashzJd:kf:
x:
opt ; do
case "$opt" in
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 ;;
d) export TMPDIR=$OPTARG ;;
f) export ARCH=$OPTARG ;;
z) zip="gzip -9"; ext=tar.gz ;;
@@
-252,6
+272,7
@@
while getopts ashzJd:kf: opt ; do
k) cleanup=0 ;;
h) usage ;;
s) prtdists ; exit 0;;
k) cleanup=0 ;;
h) usage ;;
s) prtdists ; exit 0;;
+ x) cmd="$OPTARG" ;;
?) exit 3 ;; # error in option parsing
esac
done
?) exit 3 ;; # error in option parsing
esac
done
@@
-281,9
+302,9
@@
case "$target" in
SLC7_64) slc amd64 7 ;;
BELENOS*|FLIDAS*)
debgeneric $target $MIRROR_TRISQUEL ;;
SLC7_64) slc amd64 7 ;;
BELENOS*|FLIDAS*)
debgeneric $target $MIRROR_TRISQUEL ;;
- TRUSTY*|XENIAL*)
+ TRUSTY*|XENIAL*
|BIONIC*
)
debgeneric $target $MIRROR_UBUNTU ;;
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
debgeneric $target $MIRROR_DEBIAN $ARCH;;
*) echo "Unknown distribution. Aborting."
prtdists