From 723056c40d38694c14d9bcb6b4a3108f7054a2a1 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 22 Apr 2024 12:13:13 -0400 Subject: [PATCH 1/5] update upstream to 9084a3cbc0a55422beea4a55b530c1f03a910617 feb 2024 --- fai/config/basefiles/mk-basefile | 57 ++++++++++++++++--- fai/config/class/10-base-classes | 3 +- fai/config/class/20-hwdetect.sh | 13 ++--- fai/config/class/40-parse-profiles.sh | 11 ++-- fai/config/class/41-warning.sh | 5 +- fai/config/class/50-host-classes | 14 ++--- fai/config/class/60-misc | 2 - fai/config/class/85-efi-classes | 2 +- fai/config/class/DEBIAN.var | 23 +++++++- fai/config/class/FAIBASE.var | 6 +- fai/config/class/UBUNTU.var | 2 +- fai/config/class/example.profile | 14 ++--- fai/config/disk_config/FAIBASE | 3 + fai/config/disk_config/FAIBASE_EFI | 13 +++-- fai/config/disk_config/FAISERVER_EFI | 14 ++--- fai/config/disk_config/LVM | 4 +- fai/config/disk_config/LVM_EFI | 8 +-- .../files/etc/fai/nfsroot.conf/FAISERVER | 2 +- fai/config/files/etc/rc.local/FAISERVER | 11 +++- fai/config/hooks/debconf.IMAGE | 6 +- fai/config/hooks/instsoft.DEBIAN | 3 + fai/config/hooks/savelog.LAST.sh | 3 + fai/config/hooks/updatebase.DEBIAN | 5 -- fai/config/package_config/DEBIAN | 34 ++++++----- fai/config/package_config/FAISERVER | 4 +- fai/config/package_config/GNOME | 8 ++- fai/config/package_config/STANDARD | 6 -- fai/config/package_config/UBUNTU | 24 ++++---- fai/config/package_config/XFCE | 9 +++ fai/config/scripts/CLOUD/99-cleanup | 19 ++----- fai/config/scripts/DEBIAN/30-interface | 1 - fai/config/scripts/DEBIAN/40-misc | 12 ++-- fai/config/scripts/DEMO/10-misc | 4 +- fai/config/scripts/FAIBASE/10-misc | 2 +- fai/config/scripts/FAISERVER/10-conffiles | 8 ++- fai/config/scripts/GRUB_EFI/10-setup | 18 +++++- fai/config/scripts/GRUB_PC/10-setup | 10 ++++ fai/config/scripts/LAST/50-misc | 35 ++++++++++-- fai/config/tests/Faitest.pm | 2 +- 39 files changed, 271 insertions(+), 149 deletions(-) diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile index 085b9a4..7ced32d 100755 --- a/fai/config/basefiles/mk-basefile +++ b/fai/config/basefiles/mk-basefile @@ -2,15 +2,17 @@ # mk-basefile, create basefiles for some distributions # -# Thomas Lange, Uni Koeln, 2011-2021 +# Thomas Lange, Uni Koeln, 2011-2024 # 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 -# Ubuntu 14.04/16.04 +# 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 # @@ -32,12 +34,15 @@ EXCLUDE_BUSTER= EXCLUDE_BULLSEYE= EXCLUDE_BOOKWORM= EXCLUDE_TRIXIE= +EXCLUDE_FORKY= EXCLUDE_SID= EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info EXCLUDE_XENIAL=udhcpc,dibbler-client,info EXCLUDE_BIONIC=udhcpc,dibbler-client,info EXCLUDE_FOCAL=udhcpc,dibbler-client,info +EXCLUDE_JAMMY=udhcpc,dibbler-client,info +EXCLUDE_NOBLE=udhcpc,dibbler-client,info # here you can add packages, that are needed very early INCLUDE_DEBIAN= @@ -111,7 +116,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 \ - $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 } @@ -138,6 +144,30 @@ tarit() { } +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 @@ -205,6 +235,9 @@ prtdists() { echo "Available: + ALMA9_64 + ROCKY8_64 + ROCKY9_64 CENTOS5_32 CENTOS5_64 CENTOS6_32 CENTOS6_64 CENTOS7_32 CENTOS7_64 @@ -216,6 +249,8 @@ prtdists() { XENIAL32 XENIAL64 BIONIC64 FOCAL64 + JAMMY64 + NOBLE64 SQUEEZE32 SQUEEZE64 WHEEZY32 WHEEZY64 JESSIE32 JESSIE64 @@ -224,6 +259,7 @@ prtdists() { BULLSEYE32 BULLSEYE64 BOOKWORM32 BOOKWORM64 TRIXIE32 TRIXIE64 + FORKY32 FORKY64 SID32 SID64 " } @@ -233,14 +269,14 @@ usage() { cat <&/dev/null && dpkg --print-architecture | tr a-z A-Z # determin if we are a DHCP client or not diff --git a/fai/config/class/20-hwdetect.sh b/fai/config/class/20-hwdetect.sh index 57374c8..b04a948 100755 --- a/fai/config/class/20-hwdetect.sh +++ b/fai/config/class/20-hwdetect.sh @@ -1,6 +1,6 @@ #! /bin/bash -# (c) Thomas Lange, 2002-2013, lange@informatik.uni-koeln.de +# (c) Thomas Lange, 2002-2013, lange@cs.uni-koeln.de # NOTE: Files named *.sh will be evaluated, but their output ignored. @@ -8,12 +8,11 @@ echo 0 > /proc/sys/kernel/printk -#kernelmodules= -# here, you can load modules depending on the kernel version -case $(uname -r) in - 2.6*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;; - [3456]*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;; -esac +# example how to load modules depending on the kernel version +#case $(uname -r) in +# 2.6*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;; +# [3456]*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;; +#esac for mod in $kernelmodules; do [ X$verbose = X1 ] && echo Loading kernel module $mod diff --git a/fai/config/class/40-parse-profiles.sh b/fai/config/class/40-parse-profiles.sh index 0fed6ee..cb11c17 100755 --- a/fai/config/class/40-parse-profiles.sh +++ b/fai/config/class/40-parse-profiles.sh @@ -2,7 +2,7 @@ # parse *.profile and build a curses menu, so the user can select a profile # -# (c) 2015 by Thomas Lange, lange@informatik.uni-koeln.de +# (c) 2015 by Thomas Lange, lange@cs.uni-koeln.de # Universitaet zu Koeln if [ X$FAI_ACTION = Xinstall -o X$FAI_ACTION = Xdirinstall -o X$FAI_ACTION = X ]; then @@ -14,6 +14,8 @@ fi [ "$flag_menu" ] || return 0 out=$(tty) +# save stdout and redirect stdout to tty +exec 4>&1 > $out tempfile=$(mktemp) tempfile2=$(mktemp) trap "rm -f $tempfile $tempfile2" EXIT INT QUIT @@ -147,8 +149,7 @@ while true; do dialog --clear --item-help --title "FAI - Fully Automatic Installation" --help-button \ --default-item "$default" \ --menu "\nSelect your FAI profile\n\nThe profile will define a list of classes,\nwhich are used by FAI.\n\n\n"\ - 15 70 0 "${par[@]}" 2> $tempfile 1> $out - + 15 70 0 "${par[@]}" 2> $tempfile _retval=$? case $_retval in 0) @@ -158,8 +159,10 @@ while true; do echo "No profile selected." break ;; 2) - dialog --title "Description of all profiles" --textbox $tempfile2 0 0 1> $out;; + dialog --title "Description of all profiles" --textbox $tempfile2 0 0 ;; esac done unset par ardesc arshort arlong arclasses list tempfile tempfile2 _parsed _retval line + +exec 1>&4 # restore stdout diff --git a/fai/config/class/41-warning.sh b/fai/config/class/41-warning.sh index e9f9ec5..f66085d 100755 --- a/fai/config/class/41-warning.sh +++ b/fai/config/class/41-warning.sh @@ -13,11 +13,13 @@ grep -q INSTALL $LOGDIR/FAI_CLASSES || return 0 [ "$flag_menu" ] || return 0 out=$(tty) +# save stdout and redirect stdout to tty +exec 4>&1 > $out red=$(mktemp) echo 'screen_color = (CYAN,RED,ON)' > $red DIALOGRC=$red dialog --colors --clear --aspect 6 --title "FAI - Fully Automatic Installation" --trim \ - --msgbox "\n\n If you continue, \n all your data on the disk \n \n|\Zr\Z1 WILL BE DESTROYED \Z0\Zn|\n\n" 0 0 1>$out + --msgbox "\n\n If you continue, \n all your data on the disk \n \n|\Zr\Z1 WILL BE DESTROYED \Z0\Zn|\n\n" 0 0 # stop on any error, or if ESC was hit if [ $? -ne 0 ]; then @@ -26,3 +28,4 @@ fi rm $red unset red +exec 1>&4 # restore stdout diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes index df38b88..d8ba897 100755 --- a/fai/config/class/50-host-classes +++ b/fai/config/class/50-host-classes @@ -16,16 +16,10 @@ case $HOSTNAME in gnomehost) echo "FAIBASE DEBIAN DEMO XORG GNOME";; ubuntuhost) - echo "FAIBASE DEBIAN DEMO UBUNTU FOCAL FOCAL64 XORG";; - centos) - echo "FAIBASE CENTOS" # you may want to add class XORG here - ifclass AMD64 && echo CENTOS8_64 - ;; - slchost) - # Scientific Linux Cern, is very similar to CentOS. SLC should alsways use the class CENTOS - echo "FAIBASE CENTOS SLC" # you may want to add class XORG here - ifclass I386 && echo SLC7_32 - ifclass AMD64 && echo SLC7_64 + echo "FAIBASE DEBIAN DEMO UBUNTU JAMMY JAMMY64 XORG";; + rocky) + echo "FAIBASE ROCKY" # you may want to add class XORG here + ifclass AMD64 && echo ROCKY9_64 ;; *) echo "FAIBASE DEBIAN DEMO" ;; diff --git a/fai/config/class/60-misc b/fai/config/class/60-misc index 1c3b4fd..01eb252 100755 --- a/fai/config/class/60-misc +++ b/fai/config/class/60-misc @@ -1,7 +1,5 @@ #! /bin/bash -ifclass -o CENTOS SLC && exit 0 - ifclass -o GRUB_PC GRUB_EFI && exit 0 if [ -d /sys/firmware/efi ]; then diff --git a/fai/config/class/85-efi-classes b/fai/config/class/85-efi-classes index 711b534..afe6f49 100755 --- a/fai/config/class/85-efi-classes +++ b/fai/config/class/85-efi-classes @@ -6,7 +6,7 @@ if [ ! -d /sys/firmware/efi ] || ifclass GRUB_PC; then exit 0 fi -for c in LVM FAISERVER FAIBASE; do +for c in CLOUD LVM FAISERVER FAIBASE; do if ifclass $c; then echo ${c}_EFI break diff --git a/fai/config/class/DEBIAN.var b/fai/config/class/DEBIAN.var index dc133a5..492d995 100644 --- a/fai/config/class/DEBIAN.var +++ b/fai/config/class/DEBIAN.var @@ -1,4 +1,4 @@ -release=bullseye +release=bookworm apt_cdn=http://deb.debian.org security_cdn=http://security.debian.org @@ -24,3 +24,24 @@ MODULESLIST="usbhid psmouse" # if you want to use the faiserver as APT proxy #APTPROXY=http://faiserver:3142 + + +# The linux-image package has different names for Debian and Ubuntu +if ifclass UBUNTU; then + kernelname=linux-image-generic +elif ifclass I386; then + kernelname=linux-image-686-pae +elif ifclass AMD64; then + kernelname=linux-image-amd64 +fi + +if [ -z "kernelname" ]; then + _arch=$(dpkg --print-architecture 2>/dev/null) + case $_arch in + i386) + kernelname=linux-image-686-pae ;; + *) + kernelname=linux-image-$_arch + esac + unset _arch +fi diff --git a/fai/config/class/FAIBASE.var b/fai/config/class/FAIBASE.var index 72d38f2..0e38a1f 100644 --- a/fai/config/class/FAIBASE.var +++ b/fai/config/class/FAIBASE.var @@ -17,9 +17,13 @@ STOP_ON_ERROR=700 # set parameter for install_packages(8) MAXPACKAGES=800 +# Account on the FAI server for saving log files and calling fai-chboot. +# Remove the hash character in the next line to activate this feature +#LOGUSER=fai + # a user account will be created username=demo USERPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1' # set a default -FAI_DEBOOTSTRAP="bullseye http://deb.debian.org/debian" +FAI_DEBOOTSTRAP="bookworm http://deb.debian.org/debian" diff --git a/fai/config/class/UBUNTU.var b/fai/config/class/UBUNTU.var index a258b6a..0f99b95 100644 --- a/fai/config/class/UBUNTU.var +++ b/fai/config/class/UBUNTU.var @@ -1,2 +1,2 @@ ubuntumirror=http://archive.ubuntu.com -ubuntudist=focal +ubuntudist=jammy diff --git a/fai/config/class/example.profile b/fai/config/class/example.profile index cbcbf82..c55a3ca 100644 --- a/fai/config/class/example.profile +++ b/fai/config/class/example.profile @@ -25,21 +25,21 @@ You should have a fast network connection, because most packages are downloaded from the internet. Classes: INSTALL FAIBASE DEBIAN DEMO XORG GNOME -Name: CentOS 8 -Description: CentOS 8 with Xfce desktop -Short: A normal Xfce desktop, running CentOS 8 -Long: We use the Debian nfsroot for installing the CentOS 8 OS. +Name: Rocky Linux +Description: Rocky Linux 9 with Xfce desktop +Short: A normal Xfce desktop, running Rocky Linux 9 +Long: We use the Debian nfsroot for installing the Rocky Linux 9 OS. You should have a fast network connection, because most packages are downloaded from the internet. -Classes: INSTALL FAIBASE CENTOS CENTOS8_64 XORG +Classes: INSTALL FAIBASE ROCKY ROCKY9_64 XORG Name: Ubuntu -Description: Ubuntu 20.04 LTS desktop installation +Description: Ubuntu 22.04 LTS desktop installation Short: Unity desktop Long: We use the Debian nfsroot for installing the Ubuntu OS. You should have a fast network connection, because most packages are downloaded from the internet. -Classes: INSTALL FAIBASE DEMO DEBIAN UBUNTU FOCAL FOCAL64 XORG +Classes: INSTALL FAIBASE DEMO DEBIAN UBUNTU JAMMY JAMMY64 XORG Name: Inventory Description: Show hardware info diff --git a/fai/config/disk_config/FAIBASE b/fai/config/disk_config/FAIBASE index 0c66cbc..bbcffe3 100644 --- a/fai/config/disk_config/FAIBASE +++ b/fai/config/disk_config/FAIBASE @@ -2,6 +2,9 @@ # # +# you may want to add "-O ^metadata_csum_seed" to createopts if the target +# system is older than bullseye. See #866603, #1031415, #1031416 for more info. + disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid primary / 2G-50G ext4 rw,noatime,errors=remount-ro diff --git a/fai/config/disk_config/FAIBASE_EFI b/fai/config/disk_config/FAIBASE_EFI index 8ff0e4b..cc2ed9c 100644 --- a/fai/config/disk_config/FAIBASE_EFI +++ b/fai/config/disk_config/FAIBASE_EFI @@ -1,10 +1,13 @@ # example of new config file for setup-storage # -# +# p= + +# you may want to add "-O ^metadata_csum_seed" to createopts if the target +# system is older than bullseye. See #866603, #1031415, #1031416 for more info. disk_config disk1 disklabel:gpt bootable:1 fstabkey:uuid -primary /boot/efi 512M vfat rw -primary / 2G-50G ext4 rw,noatime,errors=remount-ro -primary swap 200-10G swap sw -primary /home 100- ext4 rw,noatime,nosuid,nodev createopts="-L home -m 1" tuneopts="-c 0 -i 0" +p=efi /boot/efi 512M vfat rw +p=root / 2G-50G ext4 rw,noatime,errors=remount-ro +p= swap 200-10G swap sw +p=home /home 100- ext4 rw,noatime,nosuid,nodev createopts="-L home -m 1" tuneopts="-c 0 -i 0" diff --git a/fai/config/disk_config/FAISERVER_EFI b/fai/config/disk_config/FAISERVER_EFI index 30adbe3..e11020c 100644 --- a/fai/config/disk_config/FAISERVER_EFI +++ b/fai/config/disk_config/FAISERVER_EFI @@ -1,12 +1,12 @@ # config file for an FAI install server # -# +# p= disk_config disk1 disklabel:gpt fstabkey:uuid -primary /boot/efi 512M vfat rw -primary / 2G-15G ext4 rw,noatime,errors=remount-ro -primary swap 200-1000 swap sw -primary /tmp 100-1000 ext4 rw,noatime,nosuid,nodev createopts="-m 0" tuneopts="-c 0 -i 0" -primary /home 100-40% ext4 rw,noatime,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0" -primary /srv 1G-50% ext4 rw,noatime createopts="-m 1" tuneopts="-c 0 -i 0" +p=efi /boot/efi 512M vfat rw +p=system / 2G-15G ext4 rw,noatime,errors=remount-ro +p=swap swap 200-1000 swap sw +p= /tmp 100-1000 ext4 rw,noatime,nosuid,nodev createopts="-m 0" tuneopts="-c 0 -i 0" +p=home /home 100-40% ext4 rw,noatime,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0" +p=data /srv 1G-50% ext4 rw,noatime createopts="-m 1" tuneopts="-c 0 -i 0" diff --git a/fai/config/disk_config/LVM b/fai/config/disk_config/LVM index 868970a..71e55d3 100644 --- a/fai/config/disk_config/LVM +++ b/fai/config/disk_config/LVM @@ -4,8 +4,8 @@ disk_config disk1 fstabkey:uuid align-at:1M -primary /boot 200 ext2 rw,noatime -primary - 4G- - - +primary /boot 500 ext4 rw,noatime +primary - 4G- - - disk_config lvm diff --git a/fai/config/disk_config/LVM_EFI b/fai/config/disk_config/LVM_EFI index b2609a5..037cb51 100644 --- a/fai/config/disk_config/LVM_EFI +++ b/fai/config/disk_config/LVM_EFI @@ -1,12 +1,12 @@ -# +# p= # entire disk with LVM, separate /home disk_config disk1 disklabel:gpt fstabkey:uuid align-at:1M -primary /boot/efi 512M vfat rw -primary /boot 200 ext2 rw,noatime -primary - 4G- - - +p=efi /boot/efi 512M vfat rw +p=boot /boot 500 ext4 rw,noatime +p=system - 4G- - - disk_config lvm diff --git a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER index 72491fd..e176a6d 100644 --- a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER +++ b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER @@ -1,7 +1,7 @@ # For a detailed description see nfsroot.conf(5) # " " for debootstrap -FAI_DEBOOTSTRAP="bullseye http://deb.debian.org/debian" +FAI_DEBOOTSTRAP="bookworm http://deb.debian.org/debian" FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1' NFSROOT=/srv/fai/nfsroot diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER index 2c255cc..69a4ee0 100755 --- a/fai/config/files/etc/rc.local/FAISERVER +++ b/fai/config/files/etc/rc.local/FAISERVER @@ -20,7 +20,6 @@ if [ $? -ne 0 ]; then dpkg-reconfigure -fnoninteractive openssh-server fi sleep 8 -[ -x /etc/init.d/nscd ] && invoke-rc.d nscd restart echo "=================================" echo "Setting up the FAI install server" @@ -44,8 +43,11 @@ fi ainsl /etc/fai/fai.conf "^LOGUSER=fai" # make index, then import the packages from the CD mirror +/etc/init.d/apt-cacher-ng restart apt-get update >/dev/null +echo "Importing local packages to apt cache" curl -fs 'http://127.0.0.1:3142/acng-report.html?doImport=Start+Import&calcSize=cs&asNeeded=an#bottom' >/dev/null +echo "Creating FAI Server setup" # setup the FAI server, including creating the nfsroot, use my own proxy export APTPROXY="http://127.0.0.1:3142" @@ -67,9 +69,12 @@ else echo "==================================================" echo -e "${RED}ERROR${NORMAL}: Setting up the FAI install server ${RED}FAILED${NORMAL}!" echo "Read /var/log/fai/fai-setup.log for more debugging" + echo "Setup script is now moved to /var/tmp/$0" echo "==================================================" echo "" + cp -p $0 /var/tmp sleep 10 + rm -f $0 exit 99 fi @@ -83,7 +88,7 @@ EOF fai-chboot -o default # create a template for booting the installation -fai-chboot -Iv -f verbose,sshd,createvt,menu -u nfs://faiserver/srv/fai/config bullseye.tmpl +fai-chboot -Iv -f verbose,sshd,createvt,menu -u nfs://faiserver/srv/fai/config bookworm.tmpl # Since we do not know the MAC address, our DHCP cannot provide the hostname. # Therefore we do explicitly set the hostname @@ -96,7 +101,7 @@ done fai-monitor > /var/log/fai/fai-monitor.log & # move me away -mv $0 /var/tmp +cp -p $0 /var/tmp # create new rc.local for next reboot echo '#! /bin/bash' > /etc/rc.local diff --git a/fai/config/hooks/debconf.IMAGE b/fai/config/hooks/debconf.IMAGE index c396636..f91ae3f 100755 --- a/fai/config/hooks/debconf.IMAGE +++ b/fai/config/hooks/debconf.IMAGE @@ -3,7 +3,7 @@ # hook for installing a file system image (tar file) # this works for Ubuntu 14.04 # -# Copyright (C) 2015 Thomas Lange, lange@informatik.uni-koeln.de +# Copyright (C) 2015 Thomas Lange, lange@cs.uni-koeln.de # I use this tar command to create the image of an already running and configured machine @@ -31,8 +31,8 @@ if [ -f $target/etc/debian_version ]; then fi if [ -f $target/etc/centos-release ]; then rm $target/etc/grub2/device.map - $FAI/scripts/CENTOS/40-install-grub - $FAI/scripts/CENTOS/30-mkinitrd + $FAI/scripts/ROCKY/40-install-grub + $FAI/scripts/ROCKY/30-mkinitrd $ROOTCMD fixfiles onboot # this fixes the SELinux security contexts during the first boot fi diff --git a/fai/config/hooks/instsoft.DEBIAN b/fai/config/hooks/instsoft.DEBIAN index 35ac306..747af59 100755 --- a/fai/config/hooks/instsoft.DEBIAN +++ b/fai/config/hooks/instsoft.DEBIAN @@ -23,3 +23,6 @@ if [ $? -eq 0 ]; then $ROOTCMD apt-get -y install locales > /dev/null fi fi + +# use zstd for dracut initrd +ainsl -av /etc/dracut.conf.d/11-debian.conf "compress=zstd" diff --git a/fai/config/hooks/savelog.LAST.sh b/fai/config/hooks/savelog.LAST.sh index 6546814..ba04b98 100755 --- a/fai/config/hooks/savelog.LAST.sh +++ b/fai/config/hooks/savelog.LAST.sh @@ -182,6 +182,8 @@ disabling ASPM data block query control method not found subprocess.py.\+RuntimeWarning: line buffering Resource conflict.\+ found +os-prober will not be executed +/sys/bus/usb/devices/\*:\*/bInterface update-rc.d: warning: start and stop actions are no longer supported" # add pattern on some conditions @@ -219,4 +221,5 @@ if [ -s $errfile ]; then echo "ERRORS found in log files. See $errfile" >&2 else echo "Congratulations! No errors found in log files." +# export flag_reboot=1 # if you want to reboot if no errors are found fi diff --git a/fai/config/hooks/updatebase.DEBIAN b/fai/config/hooks/updatebase.DEBIAN index e828eef..8b5117f 100755 --- a/fai/config/hooks/updatebase.DEBIAN +++ b/fai/config/hooks/updatebase.DEBIAN @@ -7,8 +7,3 @@ else fi echo force-unsafe-io > $target/etc/dpkg/dpkg.cfg.d/unsafe-io - -# you may want to add i386 arch to amd64 hosts -# if ifclass AMD64; then -# $ROOTCMD dpkg --add-architecture i386 -# fi diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN index fe7cff7..bfa4a95 100644 --- a/fai/config/package_config/DEBIAN +++ b/fai/config/package_config/DEBIAN @@ -1,7 +1,9 @@ PACKAGES install-norec -apt-transport-https # is only needed for stretch +#cryptsetup-initramfs # needed if you use an encrypted partition +bash-completion debconf-utils file +zstd less linuxlogo rsync @@ -9,7 +11,7 @@ openssh-client openssh-server time procinfo nullmailer -eject +sudo locales console-setup kbd pciutils usbutils @@ -20,34 +22,38 @@ PACKAGES install NONFREE firmware-bnx2 firmware-bnx2x firmware-realtek firmware-linux-nonfree # a list of firmware for wifi/wireless -atmel-firmware firmware-atheros firmware-brcm80211 -firmware-iwlwifi firmware-libertas firmware-ralink firmware-zd1211 +firmware-misc-nonfree +atmel-firmware firmware-ath9k-htc firmware-brcm80211 +firmware-iwlwifi firmware-libertas firmware-zd1211 firmware-brcm80211 firmware-ti-connectivity firmware-netronome firmware-netxen firmware-realtek firmware-cavium # firmware-ipw2x00 # needs a debconf question -PACKAGES install I386 -linux-image-686-pae +# needed for a live ISO +PACKAGES install-norec LIVEISO +dracut dracut-live dracut-squash grub-pc grub-efi-amd64-bin + +PACKAGES install-norec I386 AMD64 memtest86+ -PACKAGES install CHROOT +PACKAGES install-norec CHROOT linux-image-686-pae- linux-image-amd64- -PACKAGES install AMD64 -linux-image-amd64 +PACKAGES install-norec AMD64 +${kernelname} # see class/DEBIAN.var memtest86+ -PACKAGES install ARM64 +PACKAGES install-norec ARM64 +${kernelname} # see class/DEBIAN.var grub-efi-arm64 -linux-image-arm64 -PACKAGES install GRUB_PC +PACKAGES install-norec GRUB_PC grub-pc -PACKAGES install GRUB_EFI -grub-efi +PACKAGES install-norec GRUB_EFI +grub-efi dosfstools PACKAGES install LVM lvm2 diff --git a/fai/config/package_config/FAISERVER b/fai/config/package_config/FAISERVER index 25672c8..30cf041 100644 --- a/fai/config/package_config/FAISERVER +++ b/fai/config/package_config/FAISERVER @@ -2,12 +2,12 @@ PACKAGES install-norec fai-quickstart debmirror tcpdump -xorriso grub-pc +xorriso lftp curl netselect syslinux-common pxelinux apt-cacher-ng -nscd psmisc +psmisc bind9 dnsutils iptables-persistent zile diff --git a/fai/config/package_config/GNOME b/fai/config/package_config/GNOME index a7ac908..053d022 100644 --- a/fai/config/package_config/GNOME +++ b/fai/config/package_config/GNOME @@ -1,5 +1,11 @@ -PACKAGES install-norec +# enable following two lines to get full GNOME desktop +#PACKAGES install +#task-gnome-desktop + +# stripped down version of GNOME without libreoffice +# upgrade to full desktop using: # apt install task-gnome-desktop +PACKAGES install-norec firefox-esr #thunderbird menu gdm3 diff --git a/fai/config/package_config/STANDARD b/fai/config/package_config/STANDARD index de178ae..b515458 100644 --- a/fai/config/package_config/STANDARD +++ b/fai/config/package_config/STANDARD @@ -27,11 +27,5 @@ telnet traceroute ucf xz-utils - -PACKAGES install-norec STRETCH BUSTER -python -python-minimal - -PACKAGES install-norec BULLSEYE python3 python3-minimal diff --git a/fai/config/package_config/UBUNTU b/fai/config/package_config/UBUNTU index 47e9e73..96533c4 100644 --- a/fai/config/package_config/UBUNTU +++ b/fai/config/package_config/UBUNTU @@ -1,20 +1,18 @@ -PACKAGES install I386 -linux-image-generic -memtest86+ - -PACKAGES install CHROOT -linux-image-generic- - -PACKAGES install AMD64 -linux-image-generic -memtest86+ - -PACKAGES install GRUB_PC -grub-pc +# the kernel is now defined in DEBIAN PACKAGES install ubuntu-minimal ubuntu-server +PACKAGES install XORG +ubuntu-server- +ubuntu-standard +ubuntu-desktop + PACKAGES install GERMAN language-pack-gnome-de + +PACKAGES install CHROOT +# a chroot does not need a kernel. +# See class/DEBIAN.var for the exact package name +${kernelname}- diff --git a/fai/config/package_config/XFCE b/fai/config/package_config/XFCE index 2e878d3..257afb7 100644 --- a/fai/config/package_config/XFCE +++ b/fai/config/package_config/XFCE @@ -1,6 +1,15 @@ +# enable following two lines to get full XFCE desktop +#PACKAGES install +#task-xfce-desktop + +# stripped down version of xfce4 without libreoffice +# upgrade to full desktop using: # apt install task-xfce-desktop PACKAGES install-norec xfce4 # base system xfce4-goodies # additional tools +xfce4-power-manager +light-locker lightdm +synaptic firefox-esr network-manager-gnome diff --git a/fai/config/scripts/CLOUD/99-cleanup b/fai/config/scripts/CLOUD/99-cleanup index 4580988..3ffa00c 100755 --- a/fai/config/scripts/CLOUD/99-cleanup +++ b/fai/config/scripts/CLOUD/99-cleanup @@ -1,27 +1,18 @@ #! /bin/bash -fcopy /etc/init.d/expand-root -if [ -f $target/files/etc/init.d/expand-root ]; then - $ROOTCMD insserv --default expand-root -fi - -sed -i "s/PermitRootLogin yes/PermitRootLogin without-password/" $target/etc/ssh/sshd_config +fai-sed "s/PermitRootLogin yes/PermitRootLogin without-password/" /etc/ssh/sshd_config ainsl /etc/ssh/sshd_config 'ClientAliveInterval 120' ainsl -a /etc/modprobe.d/blacklist.conf 'blacklist pcspkr' ainsl -a /etc/modprobe.d/blacklist.conf 'blacklist floppy' +cleanup_base + rm -f $target/etc/resolv.conf \ $target/etc/udev/rules.d/70-persistent-net.rules \ - $target/lib/udev/write_net_rules \ - $target/etc/mailname \ - $target/var/lib/dbus/machine-id - -> $target/etc/machine-id - -shred --remove $target/etc/ssh/ssh_host_* + $target/lib/udev/write_net_rules # FIXME: DHCP RFC3442 is used incorrect in Azure if [ -f $target/etc/dhcp/dhclient.conf ]; then - sed -ie 's,rfc3442-classless-static-routes,disabled-\0,' $target/etc/dhcp/dhclient.conf + fai-sed 's,rfc3442-classless-static-routes,disabled-\0,' /etc/dhcp/dhclient.conf fi diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface index 4b0dcf4..e31fd20 100755 --- a/fai/config/scripts/DEBIAN/30-interface +++ b/fai/config/scripts/DEBIAN/30-interface @@ -46,7 +46,6 @@ iface_stanza() { newnicnames() { - # determine predictable network names only for stretch and above local name [ $do_init_tasks -eq 0 ] && return diff --git a/fai/config/scripts/DEBIAN/40-misc b/fai/config/scripts/DEBIAN/40-misc index 714be55..3742a41 100755 --- a/fai/config/scripts/DEBIAN/40-misc +++ b/fai/config/scripts/DEBIAN/40-misc @@ -16,16 +16,16 @@ if [ ! -e $target/etc/adjtime ]; then printf "0.0 0 0.0\n0\nUTC\n" > $target/etc/adjtime fi if [ "$UTC" = "yes" ]; then - sed -i -e 's:^LOCAL$:UTC:' $target/etc/adjtime + fai-sed 's:^LOCAL$:UTC:' /etc/adjtime else - sed -i -e 's:^UTC$:LOCAL:' $target/etc/adjtime + fai-sed 's:^UTC$:LOCAL:' /etc/adjtime fi # enable linuxlogo if [ -f $target/etc/inittab ]; then - sed -i -e 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#' ${target}/etc/inittab + fai-sed 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#' /etc/inittab elif [ -f $target/lib/systemd/system/getty@.service ]; then - sed -i -e 's#sbin/agetty --noclear#sbin/agetty -f /etc/issue.linuxlogo --noclear#' $target/lib/systemd/system/getty@.service + fai-sed 's#sbin/agetty --noclear#sbin/agetty -f /etc/issue.linuxlogo --noclear#' /lib/systemd/system/getty@.service fi # make sure a machine-id exists @@ -37,9 +37,9 @@ if [ X"$(stat -c '%s' $target/etc/machine-id 2>/dev/null)" = X0 -a -f $target/b $ROOTCMD systemd-machine-id-setup fi -ln -fs /proc/mounts $target/etc/mtab +fai-link /etc/mtab ../proc/self/mounts -rm -f $target/etc/dpkg/dpkg.cfg.d/fai $target/etc/dpkg/dpkg.cfg.d/unsafe-io +rm -f $target/etc/dpkg/dpkg.cfg.d/unsafe-io if [ -d /etc/fai ]; then if ! fcopy -Mv /etc/fai/fai.conf; then diff --git a/fai/config/scripts/DEMO/10-misc b/fai/config/scripts/DEMO/10-misc index d77c048..ed2a810 100755 --- a/fai/config/scripts/DEMO/10-misc +++ b/fai/config/scripts/DEMO/10-misc @@ -17,7 +17,7 @@ fi # add additional user account if [ -n "$username" ]; then if ! $ROOTCMD getent passwd $username ; then - $ROOTCMD adduser --disabled-login --gecos "$username user" $username + $ROOTCMD adduser --disabled-password --gecos "$username user" $username $ROOTCMD usermod -p "$USERPW" $username userdir=$($ROOTCMD getent passwd "$username" | cut -d: -f6 ) @@ -28,7 +28,7 @@ if [ -n "$username" ]; then $ROOTCMD mkdir -p $xfdir $ROOTCMD cp /etc/xdg/xfce4/panel/default.xml $xfdir/xfce4-panel.xml # group name is the same as user name - $ROOTCMD chown -R $username.$username $userdir/.config + $ROOTCMD chown -R $username:$username $userdir/.config fi fi diff --git a/fai/config/scripts/FAIBASE/10-misc b/fai/config/scripts/FAIBASE/10-misc index 7a0599d..926b5f0 100755 --- a/fai/config/scripts/FAIBASE/10-misc +++ b/fai/config/scripts/FAIBASE/10-misc @@ -6,7 +6,7 @@ error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code echo $TIMEZONE > $target/etc/timezone if [ -L $target/etc/localtime ]; then - ln -sf /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime + fai-link /etc/localtime /usr/share/zoneinfo/${TIMEZONE} else cp -f /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime fi diff --git a/fai/config/scripts/FAISERVER/10-conffiles b/fai/config/scripts/FAISERVER/10-conffiles index 92b17fc..e0a60ff 100755 --- a/fai/config/scripts/FAISERVER/10-conffiles +++ b/fai/config/scripts/FAISERVER/10-conffiles @@ -27,8 +27,10 @@ if [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ] ; then # add entries for 10 hosts called client 01 .. 10 perl -e 'for (1..10) {printf "192.168.33.%s client%02s\n",101+$_,$_;}' >> $target/etc/hosts - sed -i -e '/# ReuseConnections: 1/d' $target/etc/apt-cacher-ng/acng.conf - ainsl -v /etc/apt-cacher-ng/acng.conf "ReuseConnections: 0" + fai-sed '/# ReuseConnections: 1/d' /etc/apt-cacher-ng/acng.conf + ainsl -v /etc/apt-cacher-ng/acng.conf "ReuseConnections: 1" + ainsl -v /etc/apt-cacher-ng/acng.conf "PipelineDepth: 80" + ainsl -v /etc/apt-cacher-ng/acng.conf "DlMaxRetries: 6" # copy base file for faster building of nfsroot if [ -f /var/tmp/base.tar.xz ]; then @@ -38,7 +40,7 @@ if [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ] ; then if [ -d /media/mirror/pool ]; then mkdir $target/var/cache/apt-cacher-ng/_import cp -p /media/mirror/pool/*/*/*/*.deb $target/var/cache/apt-cacher-ng/_import - $ROOTCMD chown -R apt-cacher-ng.apt-cacher-ng /var/cache/apt-cacher-ng/_import + $ROOTCMD chown -R apt-cacher-ng:apt-cacher-ng /var/cache/apt-cacher-ng/_import fi # copy basefiles from CD to config space diff --git a/fai/config/scripts/GRUB_EFI/10-setup b/fai/config/scripts/GRUB_EFI/10-setup index 7dd92d4..24054e1 100755 --- a/fai/config/scripts/GRUB_EFI/10-setup +++ b/fai/config/scripts/GRUB_EFI/10-setup @@ -11,6 +11,11 @@ error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code # installation into the removable media paths as well as the standard # debian path. +# do only execute for Debian and similar distros +if ! ifclass DEBIAN ; then + exit 0 +fi + set -a # do not set up grub during dirinstall @@ -41,28 +46,35 @@ if [ "${_bdev%%-*}" = "/dev/dm" ]; then BOOT_DEVICE=$( lvs --noheadings -o devices $BOOT_DEVICE | sed -e 's/^*\([^(]*\)(.*$/\1/' ) fi +opts="--no-floppy --target=x86_64-efi --modules=part_gpt" + # Check if RAID is used for the boot device if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then raiddev=${BOOT_DEVICE#/dev/} # install grub on all members of RAID for device in $(LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; print }' /proc/mdstat); do echo Install grub on /dev/$device - $ROOTCMD grub-install --no-floppy --force-extra-removable "/dev/$device" + $ROOTCMD grub-install $opts --force-extra-removable "/dev/$device" done elif [[ $BOOT_DEVICE =~ '/dev/loop' ]]; then # do not update vmram when using a loop device - $ROOTCMD grub-install --no-floppy --force-extra-removable --modules=part_gpt --no-nvram $BOOT_DEVICE + $ROOTCMD grub-install $opts --force-extra-removable --no-nvram $BOOT_DEVICE if [ $? -eq 0 ]; then echo "Grub installed on hostdisk $BOOT_DEVICE" fi else - $ROOTCMD grub-install --no-floppy --modules=part_gpt "$GROOT" + $ROOTCMD grub-install $opts "$GROOT" if [ $? -eq 0 ]; then echo "Grub installed on $BOOT_DEVICE = $GROOT" fi fi $ROOTCMD update-grub +if [[ $BOOT_DEVICE =~ '/dev/loop' ]]; then + : +else + efibootmgr -v +fi exit $error diff --git a/fai/config/scripts/GRUB_PC/10-setup b/fai/config/scripts/GRUB_PC/10-setup index 270b356..b23cf36 100755 --- a/fai/config/scripts/GRUB_PC/10-setup +++ b/fai/config/scripts/GRUB_PC/10-setup @@ -3,6 +3,11 @@ error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code +# do only execute for Debian and similar distros +if ! ifclass DEBIAN ; then + exit 0 +fi + set -a # do not set up grub during dirinstall @@ -19,6 +24,11 @@ fi # disable os-prober because of #802717 ainsl /etc/default/grub 'GRUB_DISABLE_OS_PROBER=true' +# efivars may still be mounted from the host system during fai-diskimage +if [ -d $target/sys/firmware/efi/efivars ]; then + umount $target/sys/firmware/efi/efivars +fi + # skip the rest, if not an initial installation if [ $FAI_ACTION != "install" ]; then $ROOTCMD update-grub diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc index 2a7271b..b80e846 100755 --- a/fai/config/scripts/LAST/50-misc +++ b/fai/config/scripts/LAST/50-misc @@ -4,6 +4,11 @@ error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code +# remove crypt password from format.log +if [ -f $LOGDIR/format.log ]; then + perl -i -pane "s/Executing: yes '.+?' \| cryptsetup/Executing: yes 'XXXXXXXXXXXXX' | cryptsetup/" $LOGDIR/format.log +fi + if [ "$FAI_ACTION" = "dirinstall" -o $do_init_tasks -eq 0 ] ; then : else @@ -15,6 +20,11 @@ else fi fi + if [ -f $target/etc/crypttab ] && [ ! -f $target/sbin/cryptsetup ]; then + echo ERROR: Encrypted devices used, but the crypsetup package was not installed. + echo ERROR: You want to add cryptsetup-initramfs or dracut to some package_config file. + fi + usedm=$(dmsetup ls 2>/dev/null | egrep -v '^live-rw|^live-base|^No devices found' | wc -l) if [ $usedm -ne 0 ]; then if [ ! -d $target/etc/lvm ]; then @@ -72,7 +82,7 @@ setrel() { return fi - dists="jessie stretch buster bullseye bookworm trixie focal bionic xenial trusty" + dists="jessie stretch buster bullseye bookworm trixie forky noble jammy focal bionic xenial trusty" for d in $dists; do if grep -iq $d $target/etc/os-release; then release=$d @@ -83,18 +93,31 @@ setrel() { # if installation was done from CD, replace useless sources.list setrel -if [ -f $target/etc/apt/sources.list -a -n "$release" ]; then - grep -q 'file generated by fai-cd' $target/etc/apt/sources.list && cat < $target/etc/apt/sources.list -deb $apt_cdn/debian $release main contrib non-free -deb $security_cdn/debian-security ${secsuite} main contrib non-free +if [ -f $target/etc/apt/sources.list ] && [ -n "$release" ]; then + if grep -q 'file generated by fai-cd' $target/etc/apt/sources.list; then + echo "Create new sources.list for $release" + cat < $target/etc/apt/sources.list +deb $apt_cdn/debian $release main contrib non-free non-free-firmware +deb $security_cdn/debian-security ${secsuite} main contrib non-free non-free-firmware #deb [trusted=yes] http://fai-project.org/download $release koeln EOF + fi # if the package fai-server was installed, enable the project's repository if dpkg-query --admindir=$target/var/lib/dpkg -W fai-server >/dev/null 2>&1; then - sed -i -e '/fai-project.org/s/^#//' $target/etc/apt/sources.list + fai-sed '/fai-project.org/s/^#//' /etc/apt/sources.list fi fi +# install default sources.list for Debian based distributions +if [ -d $target/etc/apt ] && [ ! -f $target/etc/apt/sources.list ]; then + fcopy -Svc DEBIAN_DEFAULT /etc/apt/sources.list +fi + +# older releases do not have the non-free-firmware section +if [ -n "$release" ] && [[ "buster bullseye" =~ "$release" ]]; then + sed -i -e 's/non-free-firmware//g' $target/etc/apt/sources.list +fi + # for ARM architecture, we may need the kernel and initrd to boot or flash the device if ifclass ARM64; then cp -pv $target/boot/vmlinuz* $target/boot/initrd* $FAI_RUNDIR diff --git a/fai/config/tests/Faitest.pm b/fai/config/tests/Faitest.pm index 022b407..b806599 100644 --- a/fai/config/tests/Faitest.pm +++ b/fai/config/tests/Faitest.pm @@ -2,7 +2,7 @@ # Subroutines for automatic tests # -# Copyright (C) 2009 Thomas Lange, lange@informatik.uni-koeln.de +# Copyright (C) 2009 Thomas Lange, lange@cs.uni-koeln.de # Based on the first version by Sebastian Hetze, 08/2008 package FAITEST; -- 2.30.2 From 917771b2981e75635e9b85d14eb73105fcf591b4 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 24 Apr 2024 00:55:55 -0400 Subject: [PATCH 2/5] a bunch of fixes and improvements --- README | 20 ++- fai-redep | 7 +- fai-revm | 2 +- fai/config/distro-install-common/end | 5 +- .../install-stable-kernel-debs | 31 +++- fai/config/hooks/partition.DEFAULT | 4 +- fai/config/hooks/updatebase.UBUNTU | 10 +- fai/config/package_config/ARAMO.gpg | Bin 0 -> 3471 bytes fai/config/package_config/NABIA.gpg | 1 + fai/config/package_config/STANDARD | 6 +- fai/config/package_config/readme | 2 + fai/config/scripts/DEBIAN/11-iank | 30 +++- fai/config/scripts/IANK/11-iank | 137 ++++++++++-------- faiserver-setup | 6 +- mk-basefile-big | 2 +- myfai-chboot | 18 ++- myfai-chboot-local | 56 ++++--- 17 files changed, 227 insertions(+), 110 deletions(-) create mode 100644 fai/config/package_config/ARAMO.gpg create mode 120000 fai/config/package_config/NABIA.gpg create mode 100644 fai/config/package_config/readme diff --git a/README b/README index da28e4e..6d097f9 100644 --- a/README +++ b/README @@ -128,7 +128,7 @@ archlike-pxe # Setup pxe boot server from an archlike base image fai-redep # Deploy fai configuration to host "faiserver" faiserver-uninstall # uninstall fai-server faiserver-setup # install fai-server on the current machine -myfai-chboot # setup fai tftp and nfs. useful for doing pxe-kexec +myfai-chboot # setup fai tftp and nfs. useful for doing pxe-kexec or booting from a fai-cd. pxe-server # disable/enable pxe dhcp, tfp, and nfs. calls myfai-chboot wrt-setup # setup my router in general: dhcp, dns, etc. @@ -191,6 +191,24 @@ ERROR: Kernel modules directory /lib/modules/5.10.0-8-amd not available. Only fo solution: if running from fai-cd, recreate autodiscover cd as noted above in setup. +## Weird package dependency errors + +for example: in fai.log, within instsoft.DEBIAN +``` +The following packages have unmet dependencies: + libc6 : Breaks: locales (< 2.36) but 2.35-0ubuntu3.7+11.0trisquel1 is to be installed +``` + +In this case, it was because the basefile was missing, and so instead +fai decided to use the wrong basefile. + +for example: in fai.log, within instsoft.DEBIAN + +``` +ftar: No matching class found in /var/lib/fai/config/basefiles// +ftar: extracting /var/tmp/base.tar.zst to /target/ +``` + # What good logs look like: logging nfs traffic from server diff --git a/fai-redep b/fai-redep index 5e08b2f..8e5919d 100755 --- a/fai-redep +++ b/fai-redep @@ -75,8 +75,7 @@ rsync -atL /home/iank/.ssh/authorized_keys fai/config/files/root/.ssh/authorized install --owner=iank --group=iank -d fai/config/files/usr/local/bin/hssh install --owner=iank --group=iank -d fai/config/files/usr/local/bin/ssh_filter_btrbk.sh rsync -atL /a/opt/btrbk/ssh_filter_btrbk.sh fai/config/files/usr/local/bin/ssh_filter_btrbk.sh/STANDARD - -m rsync -rlpt --delete --relative --exclude /fai/config/basefiles/ fai/config /a/opt/btrfs-progs-release "${rpre[@]}"/srv +m rsync -rlpt --delete --relative --exclude /fai/config/basefiles/ fai/config "${rpre[@]}"/srv # todo: automatically disable faiserver after a period so # these files are not available. @@ -102,6 +101,8 @@ else rsync -rlpt /q/root/shadow /q/root/luks "${rpre[@]}"/srv/fai/config/distro-install-common fi +rsync -rlpt --delete /a/opt/btrfs-progs-release "${rpre[@]}"/srv/fai/config/distro-install-common + dirs=(/p/c/machine_specific/${target:-*}/filesystem/etc/ssh) if [[ -e ${dirs[0]} ]]; then rsync -rlpt --delete --relative ${dirs[@]} "${rpre[@]}"/srv/fai/config/distro-install-common @@ -114,4 +115,4 @@ printf "%s\n%s\n" "PACKAGES install" ${pall[*]} | \ $faiserver_shell dd of=/srv/fai/config/package_config/DESKTOP status=none ||: # broken pipe -rsync -rplt --include '/*.gz' --exclude '/**' --delete-excluded $BASEFILE_DIR/ "${rpre[@]}"/srv/fai/config/basefiles/ +m rsync -rplt --include '/*.zst' --exclude '/**' --delete-excluded $BASEFILE_DIR/ "${rpre[@]}"/srv/fai/config/basefiles/ diff --git a/fai-revm b/fai-revm index 050ecda..2ce0102 100755 --- a/fai-revm +++ b/fai-revm @@ -140,7 +140,7 @@ else BASEFILE_DIR=/tmp fi isopath=$BASEFILE_DIR/$iso - isosrc=$BASEFILE_DIR/BOOKWORM64.tar.gz + isosrc=$BASEFILE_DIR/BOOKWORM64.tar.zst if [[ ! -e $isopath || $(stat -c %Y $isopath) -lt $(stat -c %Y $isosrc) ]]; then e fai-cd -g $(readlink -f grub.cfg.${iso%%.*}) -f -A $isopath fi diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end index f9a0840..2455ece 100755 --- a/fai/config/distro-install-common/end +++ b/fai/config/distro-install-common/end @@ -32,7 +32,9 @@ au() { # add user. i don't use adduser for portability # only setup root pass for bootstrap vol -if ifclass VOL_BULLSEYE_BOOTSTRAP || VOL_BOOKWORM_BOOTSTRAP; then +# for bootstrap vol, we only use root user +if ifclass VOL_BULLSEYE_BOOTSTRAP || ifclass VOL_BOOKWORM_BOOTSTRAP; then + sed 's/^/root:/' $root_pw_f | $ROOTCMD chpasswd -e exit 0 fi @@ -74,6 +76,7 @@ if getent group sudo >/dev/null; then $ROOTCMD usermod -aG sudo iank fi +mkdir -p $target/etc/sudoers.d cat >$target/etc/sudoers.d/ianksudoers <<'EOF' Defaults timestamp_timeout=1440 # used in bashrc diff --git a/fai/config/distro-install-common/install-stable-kernel-debs b/fai/config/distro-install-common/install-stable-kernel-debs index c024796..db7abcf 100755 --- a/fai/config/distro-install-common/install-stable-kernel-debs +++ b/fai/config/distro-install-common/install-stable-kernel-debs @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash # This file is part of Ian Kelling's automated-distro-installer # Copyright (C) 2024 Ian Kelling @@ -21,13 +21,30 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" -tmpdir=$(mktemp -d) || exit -trap 'cd; rm -rf "$tmpdir"' EXIT -cd $tmpdir +set -x + +prereqs=() +for p in wget curl; do + if ! type -p $p &>/dev/null; then + prereqs+=($p) + fi +done +if (( ${#prereqs[@]} >= 1 )); then + apt-get -y install ${prereqs[@]} +fi + + +tmpdir=$($ROOTCMD mktemp -d) || exit +outertmp=$target/$tmpdir +trap 'cd; rm -rf "$outertmp"' EXIT +cd $outertmp # update stable_ver when we are ready to jump to a new stable kernel. # Stable kernels are listed here: https://www.kernel.org/category/releases.html stable_ver='6\.6' +# Actually, I dont want stable right now. comment this out to get stable +# version. +stable_ver='[1-9]' va=$(curl -s https://kernel.ubuntu.com/mainline/ | \ sed -rn 's,.*alt="\[DIR\]".*href="([^/]+).*,\1,p' | \ grep -v -- -rc | sed 's/^v//' | grep "^$stable_ver" | sort -V | tail -n1) @@ -45,11 +62,11 @@ fi urls=() for p in ${pkgs[@]}; do - if ! dpkg -s -- "${p%%_*}" 2>&1 | grep -Fx "Status: install ok installed" &>/dev/null; then + if ! $ROOTCMD dpkg -s -- "${p%%_*}" 2>&1 | grep -Fx "Status: install ok installed" &>/dev/null; then urls+=(https://kernel.ubuntu.com/mainline/v$va/amd64/$p) fi done if (( ${#urls[@]} >= 1 )); then - wget "${urls[@]}" - dpkg -i ./*.deb + wget -nv "${urls[@]}" + $ROOTCMD dpkg -i ${pkgs[@]/#/$tmpdir/} fi diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 18f5a23..11a7ee5 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -885,10 +885,10 @@ if $partition; then # so use fixed sizes to allow both to grow # 600 = uefi 512 + grubext 8 + bios grub 3 + some extra cuz this is lvm #root_mib=$(( disk_mib - root2_part_mib - swap_mib - boot_part_mib - boot2_part_mib - 600 )) - o_mib=$(( 120 * 1000 )) + o_mib=$(( 180 * 1000 )) # max minus o, minus a gig just for some extra space max_root_mib=$(( disk_mib - root2_part_mib - swap_mib - boot_part_mib - boot2_part_mib - 600 - o_mib - 1000 )) - root_mib=$(( 1000 * 1000 )) # * 1000 to make it in gb. + root_mib=$(( 1700 * 1000 )) # * 1000 to make it in gb. if (( max_root_mib < root_mib )); then root_mib=$max_root_mib fi diff --git a/fai/config/hooks/updatebase.UBUNTU b/fai/config/hooks/updatebase.UBUNTU index e5050cd..98f775f 100755 --- a/fai/config/hooks/updatebase.UBUNTU +++ b/fai/config/hooks/updatebase.UBUNTU @@ -1,5 +1,12 @@ #! /bin/bash +# mk-basefile doesn't use the -updates suite, then we unpack it, then we +# install sources.list that has -updates and we install random +# packages. It might avoid a problem if we a dist-upgrade first. + +$ROOTCMD apt-get update +$ROOTCMD apt-get -y dist-upgrade --purge --auto-remove + # https://lists.uni-koeln.de/pipermail/linux-fai/2016-July/011398.html # In Ubuntu 16.04 (but not 14.04), the locales configuration mechanism has # changed. There is a /var/lib/dpkg/info/locales.config file, which @@ -9,8 +16,9 @@ # hook applies the debconf setting. It must run after FAI's debconf task # but before dpkg gets a chance to clobber debconf with an empty setting. + if [ ! -f "$target/var/lib/locales/supported.d/local" ]; then - $ROOTCMD debconf --owner=locales sh -c ' + $ROOTCMD debconf --owner=locales sh -c ' . /usr/share/debconf/confmodule db_version 2.0 db_get locales/locales_to_be_generated && diff --git a/fai/config/package_config/ARAMO.gpg b/fai/config/package_config/ARAMO.gpg new file mode 100644 index 0000000000000000000000000000000000000000..58057f6c8594d41c77bcbf17af40e5eca896e804 GIT binary patch literal 3471 zcmai$S5y;-x`mTaLy<_YF?1M#(4{3bDbl4EMF`Rf#U%8OH0fO!29PE)2vVdfB1Mp* zNR=dllpqL^-rJco_sqKY;jVlCw|~Fvm%YCA6@nNkZ36-*fDi!Q^y}mR#-T_pEUUoc zW|I~NUpjCldy+(IDg2;x@@?Jr*ukMyqs7q);caCN*u67vigS5eWT3jU_DylzJx1;E zc>ntv+FN&C$|Ti?q^4^_Zt*1X1+9pr7-BR|hL zDOxMk64u|t=KsjBzRrwK(*TQG_VlDxzlmX~`1!^U6`qv*K(M#c;i|TFL6ut5t-^^n z_J->?+2tZde6{3Li`d@oM*4{lfjT`aFR*m*%5j~J`*oMUKAZR=dYf>dp};N)&)j7Y zA$Cy+ZFOFxh2oCxZyMR5N>lZlKgq`o*vD^ZoB*x^0l*d+%SWD=0Gz82OwYs$Zsh5U z3x=s-|C32RbPaU%(fH?;^7M7{Lneb1DOrGY0Ddaazn28!p`fA%)6!5-vC)BP>8aQ$ zKtKQp3IuUP1L(kzMx|jL2CD1uwP~h9dD4`K0kr%`(K(RuYKUnQPmb&0U)}MO*E&2A zeEG1xY}miQbZRwIs~N$=xCy>DioL&*7Mn3cp-_YL2tp`u{KmYT`>>TE7O{>a$VoP* zkT*_h^$;?iq3Ey8&|eJsMkPhr;uj0iPLKaqPuWHq-6 zSv+;GjbnV(c-#A)f)`}|<#f%-i@T(EF|F`Cw(2CE2>V(RW%iyH=v=Jeaxr_8EI@N!6?9F1^&jWf$72 zYUPy4=p;gFC-(E0g58hCQbL0_8MBIgbY{%0JnJFFV^i}bKmi^c6E;Xh7K*x8093>v zoV7U?NO5Ph%0SCBu;ahk^NKFLKl`=;XZk1u&x5^UF0osPh<#-`QU4z*CdQq1T>f-4 zAykGX7pYhFP5!>3fw4lcSCc|lsT#nQTuF8 zN|nEw>($FnpWR7t{IP^Tl2^TMLmJofPCdKN2h>wSSkJMBHcp@|hA`ySXx~UJPwg{| z0jeg)Z8zPH`n#C==QvIIggP|=`J4m~=nj_G1X>&KC*7yn9ABS!OG9#1n;K15XGG}| zNxLXq@FvL! z4IZk`9`yU0J;|UOl$?Ko1pE(382%?PddHcrJk{?ozM=Y_4;x{XLT);2`^_JI)syEm zeTq7ZElwEIY5Vg?g*Rki0Qpso@hq}0N=V%(fEf7ly7On9X}#w+aMX_o3qFLyf<@JK zwr0_%pX0iIk7uWRDRgZlt-2T*nc8o_e|J>_-ZY957JK_fw6P{*qHj^M;-)hAI{eBF zQjSvSIBht$S>`Aki}Na*)fR69=#vR zLImo^4*Z|+B5RV#w%tlm5-okc*#{PZ;9q@-4r=<^C5?9>a^@X8R%fW4f>^_bcF0}8 zoS5EuK!PQ3GW1}UeR%*Dcr3NvuWjX487bbGeTdRF+~K*NI_Vmu^VQj{cKd!HtGYzK z47zPR=__WIQ=8m-W!^5M1C^DHlipWPw-S(5bYvmzJM81l)um{cg5?@&oQ7YSX=Lcz zyj8xOHmcEFSd{5;mUKp0M)ExE>R(TEE-dF4&VDYrS}~`n`?e5 zQWihlEIuvML+BA3(26McR+V!bD*THWE@rZ$f7!|lkB*Ur=QG1c?PCGMb@M%GA(3$f z+z|{VDM<&7l_L?*BPefuXGby=b_ek+g}A|wBbnoiAS7R!ffF5@Ca84jm-l~Dwy zB<1tk*f8$&uoN&VA@@lE0;6)~BKFs#oZP&4V%sj#gXF`F_D5{7ZB1)U@UU zNz3zk=@nY+hIJ6SamByzMGzUQsezt?DNU)M*!?OOL|!?=_Dj8(Ml z14$v~aZA_T9@1Rx`d~dvmWwRYpKz1MfOGc+cGVLg4fb+esAa?n-%%aqkSyUZ$>v@5Q) zGn=A=u3m#2#S|lebu?aiT+%K0ia|Qbw>49_nj*OdYyVnyAP11URrTY^*{3p;ZDFTj z=wx>@vPoIxbocf2b%z$aU&XTaz|)bMb>NiJd?#3T)h|xoh}a@ zvJ?3XVJ+`Fbu)`#)6%A?&G<5B*h6*0I0dEW<9PE}G8?aGOXSt={g!sTaqnJS*b-2Q z25x-^wv%&tqC|K)o@sc|D_tS5TPMp+xv%#d0|)s~HirJ$xg-NuQUa&K#Tz?j_H*4| zEl1tsd|y>IZz0szuAuTC1!iEG*Ok;X>B_M^8trQ7By)l946fJ!9oeknGpa{L{MmwM z;cUrJ41-sa1JvUEbgOicb_yOI))z$#jK-AtYf=q*e(-qw-79L_#i(k$;{Y@0z(50u z^e$c}e3F6*pDe>yeIxE7}9yvf`;pPdWM$z$ieG8Ex6;X}w|Nb7C3pExYVur#XTeK1WQ zmQbIm%h$vzR-MzWVz+JtS`(C-2CVm-JLC)SYeI-^@r$7Rj(#SQi}}z9ttqOsM?V(D zlV39yavC`~nhx?bGfs{duIoIHG(hJ)Zi8&^4D;zgv#q?$hIVN~Z{bJ(s8~{vm2T7Y kDK58jDM_m@{W4`V&cSo>@T=Npjm1F5D{276Uqc4`3p!M6MF0Q* literal 0 HcmV?d00001 diff --git a/fai/config/package_config/NABIA.gpg b/fai/config/package_config/NABIA.gpg new file mode 120000 index 0000000..84bd61d --- /dev/null +++ b/fai/config/package_config/NABIA.gpg @@ -0,0 +1 @@ +ARAMO.gpg \ No newline at end of file diff --git a/fai/config/package_config/STANDARD b/fai/config/package_config/STANDARD index c0726e6..f55e664 100644 --- a/fai/config/package_config/STANDARD +++ b/fai/config/package_config/STANDARD @@ -21,9 +21,6 @@ ncurses-term openssh-client pciutils perl -# ian: newer distros dont have python, it gets naturally removed -python -python-minimal python3 python3-minimal reportbug @@ -49,7 +46,6 @@ rsync openssh-client openssh-server time procinfo -locales console-setup kbd pciutils usbutils unattended-upgrades @@ -67,6 +63,8 @@ iso-codes cryptsetup-initramfs # for btrbk zstd +# for detecting wireless +iw # iank, copied from DEBIAN so it goes into ubuntu too PACKAGES install GRUB_PC diff --git a/fai/config/package_config/readme b/fai/config/package_config/readme new file mode 100644 index 0000000..abb42b7 --- /dev/null +++ b/fai/config/package_config/readme @@ -0,0 +1,2 @@ +ian: Ya, for each trisquel release, we need a new key symlink link, or +new file if the key has changed. diff --git a/fai/config/scripts/DEBIAN/11-iank b/fai/config/scripts/DEBIAN/11-iank index 69b9afe..130c7e9 100755 --- a/fai/config/scripts/DEBIAN/11-iank +++ b/fai/config/scripts/DEBIAN/11-iank @@ -24,12 +24,33 @@ if [[ $EUID != 0 ]]; then exit 1 fi +m() { printf "%s\n" "$*"; "$@"; } + + fcopy -riB /root +# in bullseye, installing systemd-resolved says: Converting +# /etc/resolv.conf to a symlink to +# /run/systemd/resolve/stub-resolv.conf... which breaks +# resolution. This happens to be the first script we install a package +# after that. This should do nothing in a fai-wrapper situation. +if [[ ! -s $target/etc/resolv.conf ]]; then + m ls -la $target/etc/resolv.conf ||: + # Keep the symlink in place, systemd-resolved should change the file + # when it runs. + mkdir -p $target/run/systemd/resolve + if [[ ! -s /etc/resolv.conf ]] && ! host google.com; then + echo "ERROR: empty resolv.conf & failed dns resolution. exiting 1" >&2 + exit 1 + fi + cat /etc/resolv.conf >$target/etc/resolv.conf +fi + + #### misc configurations chroot $FAI_ROOT bash <<'EOFOUTER' -set -x +set -xe if getent group systemd-journal >/dev/null; then # makes the journal be saved to disk. mkdir -p /var/log/journal @@ -38,7 +59,12 @@ fi debconf-set-selections </dev/null; then sudo apt-get -y install fai-client fi -if [[ -e /a/bin/fai/fai-wrapper ]]; then - chroot() { - shift - "$@" - } -fi - -if [[ $FAI_ROOT == / ]]; then - source /a/bin/bash_unpublished/source-state - bprogs_dir=/a/opt/btrfs-progs-release -else - bprogs_dir=/srv/btrfs-progs-release - chroot="chroot $FAI_ROOT" -fi - # -r = recursive # -i = ignore non-matching class warnings, always exit 0 # -B = no backup files @@ -66,6 +51,8 @@ if [[ ! -e $dst && -e $src ]]; then mount -o bind $src $dst fi + + $FAI/distro-install-common/end @@ -75,13 +62,13 @@ $FAI/distro-install-common/end # I run this as a single post-fai script to update things that have changed. tmpfile1=$(mktemp) # this can fail if we need an apt update -$chroot /usr/bin/apt-cache policy >$tmpfile1 ||: +$ROOTCMD /usr/bin/apt-cache policy >$tmpfile1 ||: fcopy -riB /etc/apt tmpfile2=$(mktemp) -$chroot /usr/bin/apt-cache policy >$tmpfile2 +$ROOTCMD /usr/bin/apt-cache policy >$tmpfile2 if ! diff -q $tmpfile1 $tmpfile2; then - $chroot /usr/bin/apt update + $ROOTCMD /usr/bin/apt update fi # outside of fai, this seems to regularly lead to # E: Could not get lock /var/lib/apt/lists/lock - open (11: Resource temporarily unavailable) @@ -105,7 +92,6 @@ fi #### misc configurations - if [[ $FAI_ACTION != dirinstall ]] && ! ifclass NOCRYPT; then if ifclass LINODE; then speed=19200 @@ -131,7 +117,7 @@ TimeoutStartSec=20 WantedBy=dev-disk-by\x2did-ata\x2dSamsung_SSD_870_QVO_8TB_S5VUNG0N900656V.device EOF - $chroot bash <<'EOFOUTER' + $ROOTCMD bash <<'EOFOUTER' systemctl enable myncq.service /usr/bin/myncq no-upgrub EOFOUTER @@ -180,8 +166,8 @@ EOF fi # use networkmanager if this host has wireless. -if [[ $HOSTNAME == bo ]] || type -p iw &>/dev/null && [[ $(iw dev) ]]; then - $chroot bash </dev/null | awk '{print $2}') ||: -if [[ $ver != "$cur_ver" ]]; then - if [[ $HOST2 == "$HOSTNAME" && $ver != "$($bprogs_dir/btrfs --version 2>/dev/null | awk '{print $2}')" ]]; then - rm -rf $bprogs_dir - cd /tmp - wget $url - sudo -u iank tar xzf $tarball - mv ${tarball%.tar.gz} $bprogs_dir - cd $bprogs_dir - apt-get -y build-dep btrfs-progs - sudo -u iank ./configure --disable-documentation - sudo -u iank make - make install - else - $chroot bash -xe <$target/etc/initramfs-tools/conf.d/mine </dev/null | awk '{print $2}') ||: + +if [[ $FAI_ROOT == / ]]; then + bp_dir=/a/opt/btrfs-progs-release +else + bp_dir=$FAI/distro-install-common/btrfs-progs-release +fi +if [[ $ver != "$cur_ver" ]]; then + if [[ $ver != "$($bp_dir/btrfs --version 2>/dev/null | awk '{print $2}')" ]]; then + cd $target/tmp + wget $url + tar xzf $tarball + $ROOTCMD apt-get -y build-dep btrfs-progs + # no docs cuz I didn't want to bother fixing error of missing docs dependencies + $ROOTCMD bash -xe <&1 | grep -Fx "Status: install ok installed" &>/dev/null; then + $ROOTCMD apt-get -y install build-essential + fi + + if [[ $FAI_ROOT == / ]]; then + cd /a/opt/btrfs-progs-release + make install + else + mkdir -p $target/tmp/bprogs + mount -o bind $bp_dir $target/tmp/bprogs + $ROOTCMD bash -xe < /a/bin/fai-basefiles/basefiles/${distver^^}64BIG.tar.gz +tar --one-file-system -C $t -cf - . | zstd -9 > /a/bin/fai-basefiles/basefiles/${distver^^}64BIG.tar.zst cleanup diff --git a/myfai-chboot b/myfai-chboot index 743859a..a653ae6 100755 --- a/myfai-chboot +++ b/myfai-chboot @@ -31,18 +31,26 @@ If our kernel has no nfs support, uses apache intead of nfs, and depends on another repo of Ian Kelling, basic-https-conf, where the file is at /a/exe/web-conf. -Usng this, you can boot into fai with pxe-kexec without changing -the dhcp server. +Using this, you can boot into fai with pxe-kexec without changing the +dhcp server. Note, if you are booting using fai-cd, the pxe config does +nothing, and only flags affecting FAI_ACTION will have any affect. You +can change the fai flags in the grub config, for example in +./grub.cfg.autodiscover, or at runtime by editing a grub menu option. +We could probably also set FAI_FLAGS the same way we set FAI_ACTION, +but I haven't tried it. -Argument sets the host to enable it for. No argument disables pxe -config for all hosts, but leaves nfs server alone. Use faiserver-disable -to disable the nfs server. +HOSTNAME|IP|default Sets the host to enable it for. No argument + disables pxe config for all hosts, but leaves nfs + server alone. Use faiserver-disable to disable the + nfs server. -S sets FAI_ACTION=sysinfo, and remove fai flag reboot. Usefull for doing a system recovery. It reboots automatically anyways :( -k Add serial port output for kgped16 -i sets FAI_ACTION=inventory and remove fai flag reboot. I'm not sure what this is usefull for. +-b Setup bonded ethernet. +--no-r Tell fai-chboot not to reboot when its done. This is implied by -i and -S. -h|--help Print help and exit. EOF diff --git a/myfai-chboot-local b/myfai-chboot-local index 4cef9a5..7dea8f2 100755 --- a/myfai-chboot-local +++ b/myfai-chboot-local @@ -16,54 +16,72 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# note, this script gets piped to bash, so cant cd to current dir -[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@" +[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" + +set -x set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR +pre="${0##*/}:" +m() { printf "$pre %s\n" "$*"; "$@"; } +e() { printf "$pre %s\n" "$*"; } +err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $pre: $*" >&2; } + +usage() { + cat <&2; exit 1; } + +temp=$(getopt -l help,no-r hSi "$@") || usage 1 +eval set -- "$temp" +while true; do case $1 in - -h|--help) - echo "see help from myfai-chboot" - exit 0 - ;; -S) fai_action=sysinfo fai_reboot_arg= - shift ;; -i) #inventory fai_action=inventory fai_reboot_arg= - shift ;; -k) kgped16=true - shift ;; -b) bond=true - shift ;; --no-r) fai_reboot_arg= - shift ;; + -h|--help) usage ;; + --) shift; break ;; + *) echo "$0: unexpected args: $*" >&2 ; usage 1 ;; esac + shift done - -pre="${0##*/}:" -m() { printf "$pre %s\n" "$*"; "$@"; } -e() { printf "$pre %s\n" "$*"; } -err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $pre: $*" >&2; } - -host=$1 +read -r host <<<"$@" +readonly host rm -f /srv/tftp/fai/pxelinux.cfg/* -- 2.30.2 From 5c8f49a1d5321a0d3f01284f0087740af070962b Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 24 Apr 2024 15:23:06 -0400 Subject: [PATCH 3/5] minor: docs --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 6d097f9..f9d0853 100644 --- a/README +++ b/README @@ -104,7 +104,7 @@ fai/config/distro-install-common/end and which shadow file / luks file(s) to copy into the new machine depends on fai-redep arguments. -Also, setup dns in bind and wrt-setup-local. +Also, setup dns in /p/c/host-info and firewall redirects in wrt-setup-local. After install, btrbk to setup data, and then distro-begin && distro end. See notes in distro-begin for other configuration. -- 2.30.2 From c5eccfae1f48f183af80847fcabcc35e3563469d Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sat, 27 Apr 2024 17:03:04 -0400 Subject: [PATCH 4/5] handle ssh redirects programatically --- wrt-setup | 2 +- wrt-setup-local | 64 ++----------------------------------------------- 2 files changed, 3 insertions(+), 63 deletions(-) diff --git a/wrt-setup b/wrt-setup index ec91ed7..bce6a4a 100755 --- a/wrt-setup +++ b/wrt-setup @@ -77,7 +77,7 @@ scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-loc #/a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \ scp /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \ - /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk} /p/c/ptr-data /p/c/dnsmasq-data /b/bash-bear-trap/bash-bear $h: + /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk} /p/c/ptr-data /p/c/{dnsmasq,cmc-firewall}-data /b/bash-bear-trap/bash-bear $h: scp ../openwrtkeyring/usign/* $h:/etc/opkg/keys ssh $h wrt-init ${HOME_DOMAIN:-b8.nz} "$@" diff --git a/wrt-setup-local b/wrt-setup-local index aabfca3..3d2edb8 100755 --- a/wrt-setup-local +++ b/wrt-setup-local @@ -666,6 +666,7 @@ config rule option target REJECT ## end no external dns for ziva +$(. /root/cmc-firewall-data) config rule option src wan @@ -684,18 +685,6 @@ config rule option target ACCEPT option dest_port 9091 -config redirect - option name sshkd - option src wan - option src_dport 2202 - option dest_port 22 - option dest_ip $l.2 - option dest lan -config rule - option src wan - option target ACCEPT - option dest_port 2202 - # was working on an openvpn server, didn't finish # config redirect # option name vpnkd @@ -723,55 +712,6 @@ config rule option dest_port 8989 -config redirect - option name sshx2 - option src wan - option src_dport 2205 - option dest_port 22 - option dest_ip $l.5 - option dest lan -config rule - option src wan - option target ACCEPT - option dest_port 2205 - -config redirect - option name sshx3 - option src wan - option src_dport 2207 - option dest_port 22 - option dest_ip $l.7 - option dest lan -config rule - option src wan - option target ACCEPT - option dest_port 2207 - -config redirect - option name sshbb8 - option src wan - option src_dport 2209 - option dest_port 22 - option dest_ip $l.32 - option dest lan -config rule - option src wan - option target ACCEPT - option dest_port 2209 - - -config redirect - option name sshfrodo - option src wan - option src_dport 2234 - option dest_port 34 - option dest_ip $l.34 - option dest lan -config rule - option src wan - option target ACCEPT - option dest_port 2234 - config redirect option name icecast @@ -822,7 +762,7 @@ config rule option target ACCEPT option dest_port 4533 -# So a client can just have i.b8.nz dns even when they +# So a client can just have b8.nz dns even when they # are on the lan. #config redirect # option name navidromelan -- 2.30.2 From a03d1a5cf4c6583c075a5b80e729f8f72ed0d338 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 28 Apr 2024 09:31:36 -0400 Subject: [PATCH 5/5] static usb ethnet addresses --- fai-redep | 6 +++++- fai/config/scripts/IANK/11-iank | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/fai-redep b/fai-redep index 8e5919d..b90b30a 100755 --- a/fai-redep +++ b/fai-redep @@ -80,6 +80,7 @@ m rsync -rlpt --delete --relative --exclude /fai/config/basefiles/ fai/config "$ # todo: automatically disable faiserver after a period so # these files are not available. + if [[ $target ]]; then secret_files=(luks/$target luks/host-$target shadow/$target) exists=false @@ -101,7 +102,10 @@ else rsync -rlpt /q/root/shadow /q/root/luks "${rpre[@]}"/srv/fai/config/distro-install-common fi -rsync -rlpt --delete /a/opt/btrfs-progs-release "${rpre[@]}"/srv/fai/config/distro-install-common +rsync -rlpt --delete /a/opt/btrfs-progs-release \ + filesystem/usr/local/bin/ethusb-nm \ + filesystem/usr/local/bin/ethusb-static \ + "${rpre[@]}"/srv/fai/config/distro-install-common dirs=(/p/c/machine_specific/${target:-*}/filesystem/etc/ssh) if [[ -e ${dirs[0]} ]]; then diff --git a/fai/config/scripts/IANK/11-iank b/fai/config/scripts/IANK/11-iank index ce0be4b..54641b2 100755 --- a/fai/config/scripts/IANK/11-iank +++ b/fai/config/scripts/IANK/11-iank @@ -184,6 +184,16 @@ EOF [main] dns=systemd-resolved EOF + + $FAI/distro-install-common/ethusb-static + if [[ $(dig +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]] \ + && ip n show 10.2.0.1 | grep . &>/dev/null; then + : # we are at home. note: logic duplicated in btrbk-run + else + $FAI/distro-install-common/ethusb-nm + fi + + else cat > $target/etc/network/interfaces <<-EOF # generated by FAI -- 2.30.2