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
bug fix
[automated-distro-installer]
/
fai
/
config
/
basefiles
/
mk-basefile
diff --git
a/fai/config/basefiles/mk-basefile
b/fai/config/basefiles/mk-basefile
index b9b67f5ca18bd18a1487f17f5a084e07d953cdf4..d449c604f4268c132360da66eb16abd17f9f2df1 100755
(executable)
--- a/
fai/config/basefiles/mk-basefile
+++ b/
fai/config/basefiles/mk-basefile
@@
-1,16
+1,18
@@
#! /bin/bash
# mk-basefile, create basefiles for some distributions
#
#! /bin/bash
# mk-basefile, create basefiles for some distributions
#
-# Thomas Lange, Uni Koeln, 2011-20
18
+# Thomas Lange, Uni Koeln, 2011-20
24
# based on the Makefile implementation of Michael Goetze
#
# Usage example: mk-basefile -J STRETCH64
# This will create a STRETCH64.tar.xz basefile.
# based on the Makefile implementation of Michael Goetze
#
# Usage example: mk-basefile -J STRETCH64
# This will create a STRETCH64.tar.xz basefile.
-# Supported distributions (
each
i386/amd64):
+# Supported distributions (i386/amd64):
# Debian GNU/Linux
# Debian GNU/Linux
-# Ubuntu 14.04/16.04
-# CentOS 5/6/7
+# Ubuntu 14.04/16.04/20.04/22.04
+# AlmaLinux 9
+# Rocky Linux 8/9
+# CentOS 5/6/7/8
# Scientific Linux Cern 5/6
#
# Packages you might want to install to use this command:
# Scientific Linux Cern 5/6
#
# Packages you might want to install to use this command:
@@
-28,7
+30,11
@@
EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info
EXCLUDE_WHEEZY=info
EXCLUDE_JESSIE=info
EXCLUDE_STRETCH=info
EXCLUDE_WHEEZY=info
EXCLUDE_JESSIE=info
EXCLUDE_STRETCH=info
-EXCLUDE_BUSTER=info
+EXCLUDE_BUSTER=
+EXCLUDE_BULLSEYE=
+EXCLUDE_BOOKWORM=
+EXCLUDE_TRIXIE=
+EXCLUDE_FORKY=
EXCLUDE_SID=
EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
EXCLUDE_SID=
EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
@@
-37,10
+43,17
@@
EXCLUDE_XENIAL=udhcpc,dibbler-client,info
EXCLUDE_FLIDAS=udhcpc,dibbler-client,info
EXCLUDE_BIONIC=udhcpc,dibbler-client,info
EXCLUDE_ETIONA=udhcpc,dibbler-client,info
EXCLUDE_FLIDAS=udhcpc,dibbler-client,info
EXCLUDE_BIONIC=udhcpc,dibbler-client,info
EXCLUDE_ETIONA=udhcpc,dibbler-client,info
+EXCLUDE_FOCAL=udhcpc,dibbler-client,info
+EXCLUDE_NABIA=udhcpc,dibbler-client,info
+EXCLUDE_JAMMY=udhcpc,dibbler-client,info
+EXCLUDE_ARAMO=udhcpc,dibbler-client,info
+EXCLUDE_NOBLE=udhcpc,dibbler-client,info
# here you can add packages, that are needed very early
INCLUDE_DEBIAN=
INCLUDE_ETIONA=ifupdown
# here you can add packages, that are needed very early
INCLUDE_DEBIAN=
INCLUDE_ETIONA=ifupdown
+INCLUDE_NABIA=ifupdown
+INCLUDE_ARAMO=ifupdown
setarch() {
setarch() {
@@
-52,7
+65,7
@@
setarch() {
check() {
check() {
- if [
`id -u`
!= 0 ]; then
+ if [
$(id -u)
!= 0 ]; then
echo "You must be root to create chroots."
exit 1
fi
echo "You must be root to create chroots."
exit 1
fi
@@
-118,7
+131,8
@@
cleanup-deb() {
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 \
- $xtmp/etc/udev/rules.d/70-persistent-net.rules
+ $xtmp/etc/udev/rules.d/70-persistent-net.rules \
+ $xtmp/var/lib/dbus/machine-id
> $xtmp/etc/machine-id
}
> $xtmp/etc/machine-id
}
@@
-141,10
+155,34
@@
cleanup-rinse() {
tarit() {
tarit() {
- tar $attributes --one-file-system -C $xtmp -cf - . | $zip > $target.$ext
+ tar $attributes --
numeric-owner --
one-file-system -C $xtmp -cf - . | $zip > $target.$ext
}
}
+rpmdist() {
+
+ local arch=$1
+ local vers=$2
+ local dist=$3
+ local domain=$(domainname)
+
+ check
+ setarch $arch
+ $l32 rinse --directory $xtmp --distribution $dist-$vers --arch $arch --before-post-install $xtmp/post
+ domainname $domain # workaround for #613377
+ cleanup-rinse
+ tarit
+}
+
+
+alma() {
+ rpmdist $1 $2 alma
+}
+
+rocky() {
+ rpmdist $1 $2 rocky
+}
+
centos() {
local arch=$1
centos() {
local arch=$1
@@
-211,9
+249,13
@@
prtdists() {
echo "Available:
echo "Available:
+ ALMA9_64
+ ROCKY8_64
+ ROCKY9_64
CENTOS5_32 CENTOS5_64
CENTOS6_32 CENTOS6_64
CENTOS7_32 CENTOS7_64
CENTOS5_32 CENTOS5_64
CENTOS6_32 CENTOS6_64
CENTOS7_32 CENTOS7_64
+ CENTOS8_64
SLC5_32 SLC5_64
SLC6_32 SLC6_64
SLC7_64
SLC5_32 SLC5_64
SLC6_32 SLC6_64
SLC7_64
@@
-222,11
+264,20
@@
prtdists() {
FLIDAS64
BIONIC64
ETIONA64
FLIDAS64
BIONIC64
ETIONA64
+ FOCAL64
+ NABIA64
+ JAMMY64
+ ARAMO64
+ NOBLE64
SQUEEZE32 SQUEEZE64
WHEEZY32 WHEEZY64
JESSIE32 JESSIE64
STRETCH32 STRETCH64
BUSTER32 BUSTER64
SQUEEZE32 SQUEEZE64
WHEEZY32 WHEEZY64
JESSIE32 JESSIE64
STRETCH32 STRETCH64
BUSTER32 BUSTER64
+ BULLSEYE32 BULLSEYE64
+ BOOKWORM32 BOOKWORM64
+ TRIXIE32 TRIXIE64
+ FORKY32 FORKY64
SID32 SID64
"
}
SID32 SID64
"
}
@@
-236,14
+287,14
@@
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-20
18
by Thomas Lange
+ Copyright (C) 2011-20
23
by Thomas Lange
Usage: mk-basefile [OPTION] ... DISTRIBUTION
-s Show list of supported linux distributions
-f ARCH Build for foreign architecture ARCH.
-d DIR Use DIR for creating the temporary subtree structure.
Usage: mk-basefile [OPTION] ... DISTRIBUTION
-s Show list of supported linux distributions
-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.
+ -z Use
zstd
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.
-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.
@@
-270,7
+321,7
@@
while getopts ashzJd:kf:x: opt ; do
a) echo "$0: Warning. -a is ignored, because xtattrs, acls and selinux are always added." ;;
d) export TMPDIR=$OPTARG ;;
f) export ARCH=$OPTARG ;;
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
;;
+ z) zip="
zstd -9"; ext=tar.zst
;;
J) zip="xz -8" ext=tar.xz ;;
k) cleanup=0 ;;
h) usage ;;
J) zip="xz -8" ext=tar.xz ;;
k) cleanup=0 ;;
h) usage ;;
@@
-279,7
+330,7
@@
while getopts ashzJd:kf:x: opt ; do
?) exit 3 ;; # error in option parsing
esac
done
?) exit 3 ;; # error in option parsing
esac
done
-shift $((
$
OPTIND - 1))
+shift $((OPTIND - 1))
xtmp=$(mktemp --tmpdir -d basefiles.XXXXXXXX)
if [ $? -eq 1 ]; then
xtmp=$(mktemp --tmpdir -d basefiles.XXXXXXXX)
if [ $? -eq 1 ]; then
@@
-298,16
+349,20
@@
case "$target" in
CENTOS6_64) centos amd64 6 ;;
CENTOS7_32) centos i386 7 ;;
CENTOS7_64) centos amd64 7 ;;
CENTOS6_64) centos amd64 6 ;;
CENTOS7_32) centos i386 7 ;;
CENTOS7_64) centos amd64 7 ;;
+ CENTOS8_64) centos amd64 8 ;;
+ ROCKY8_64) rocky amd64 8 ;;
+ ROCKY9_64) rocky amd64 9 ;;
+ ALMA9_64) alma amd64 9 ;;
SLC5_32) slc i386 5 ;;
SLC5_64) slc amd64 5 ;;
SLC6_32) slc i386 6 ;;
SLC6_64) slc amd64 6 ;;
SLC7_64) slc amd64 7 ;;
SLC5_32) slc i386 5 ;;
SLC5_64) slc amd64 5 ;;
SLC6_32) slc i386 6 ;;
SLC6_64) slc amd64 6 ;;
SLC7_64) slc amd64 7 ;;
- BELENOS*|FLIDAS*|ETIONA*)
+ BELENOS*|FLIDAS*|ETIONA*
|NABIA*|ARAMO*
)
debgeneric $target $MIRROR_TRISQUEL ;;
debgeneric $target $MIRROR_TRISQUEL ;;
- TRUSTY*|XENIAL*|BIONIC*)
+ TRUSTY*|XENIAL*|BIONIC*
|FOCAL*|JAMMY*|NOBLE*
)
debgeneric $target $MIRROR_UBUNTU ;;
debgeneric $target $MIRROR_UBUNTU ;;
- SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*|SID*)
+ SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*|
BULLSEYE*|BOOKWORM*|TRIXIE*|FORKY*|
SID*)
debgeneric $target $MIRROR_DEBIAN $ARCH;;
*) echo "Unknown distribution. Aborting."
prtdists
debgeneric $target $MIRROR_DEBIAN $ARCH;;
*) echo "Unknown distribution. Aborting."
prtdists