From: Ian Kelling Date: Tue, 24 Nov 2020 22:12:32 +0000 (-0500) Subject: Merge branch 'upstream' X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=commitdiff_plain;h=fe81034ee9664d8e131bac218b40d99a58a31649;hp=-c Merge branch 'upstream' Switched UBUNTU to use DEBIAN + UBUNTU to be more in line with upstream. I expect this may break things. --- fe81034ee9664d8e131bac218b40d99a58a31649 diff --combined fai/config/basefiles/mk-basefile index b9b67f5,be00fe2..8878aad --- a/fai/config/basefiles/mk-basefile +++ b/fai/config/basefiles/mk-basefile @@@ -1,7 -1,8 +1,7 @@@ #! /bin/bash - # mk-basefile, create basefiles for some distributions # - # Thomas Lange, Uni Koeln, 2011-2018 + # Thomas Lange, Uni Koeln, 2011-2020 # based on the Makefile implementation of Michael Goetze # # Usage example: mk-basefile -J STRETCH64 @@@ -10,7 -11,7 +10,7 @@@ # Supported distributions (each i386/amd64): # Debian GNU/Linux # Ubuntu 14.04/16.04 - # CentOS 5/6/7 + # CentOS 5/6/7/8 # Scientific Linux Cern 5/6 # # Packages you might want to install to use this command: @@@ -21,26 -22,24 +21,28 @@@ # For the first stage, set the CentOS/SLC mirror in /etc/rinse/rinse.conf MIRROR_DEBIAN=http://deb.debian.org/debian/ MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/ +MIRROR_TRISQUEL=http://mirror.fsf.org/trisquel/ MIRROR_CENTOS=http://mirror.netcologne.de/ EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info EXCLUDE_WHEEZY=info EXCLUDE_JESSIE=info EXCLUDE_STRETCH=info - EXCLUDE_BUSTER=info + EXCLUDE_BUSTER= + EXCLUDE_BULLSEYE= EXCLUDE_SID= +EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info 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_FOCAL=udhcpc,dibbler-client,info # here you can add packages, that are needed very early INCLUDE_DEBIAN= - +INCLUDE_ETIONA=ifupdown setarch() { @@@ -52,7 -51,7 +54,7 @@@ check() { - if [ `id -u` != 0 ]; then + if [ $(id -u) != 0 ]; then echo "You must be root to create chroots." exit 1 fi @@@ -107,14 -106,6 +109,14 @@@ EO 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 \ @@@ -141,7 -132,7 +143,7 @@@ cleanup-rinse() 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 } @@@ -186,11 -177,12 +188,11 @@@ debgeneric() dist=${DIST%%[0-9][0-9]} local exc="EXCLUDE_$dist" [ -n "${!exc}" ] && exc="--exclude=${!exc}" || unset exc + local inc="INCLUDE_$dist" + [ -n "${!inc}" ] && inc="--include=${!inc}" || unset inc dist=${dist,,} check - if [ -n "$INCLUDE_DEBIAN" ]; then - local inc="--include=$INCLUDE_DEBIAN" - fi if [ -n "$arch" ]; then qemu-debootstrap --arch $arch ${exc} $inc $dist $xtmp $mirror @@@ -214,19 -206,20 +216,22 @@@ prtdists() CENTOS5_32 CENTOS5_64 CENTOS6_32 CENTOS6_64 CENTOS7_32 CENTOS7_64 + CENTOS8_64 SLC5_32 SLC5_64 SLC6_32 SLC6_64 SLC7_64 TRUSTY32 TRUSTY64 XENIAL32 XENIAL64 + FLIDAS64 BIONIC64 + ETIONA64 + FOCAL64 SQUEEZE32 SQUEEZE64 WHEEZY32 WHEEZY64 JESSIE32 JESSIE64 STRETCH32 STRETCH64 BUSTER32 BUSTER64 + BULLSEYE32 BULLSEYE64 SID32 SID64 " } @@@ -236,7 -229,7 +241,7 @@@ usage() cat <= 4 disks with boot partititions. +# +# LINODE: For running a vm on linode, especially one created with fai-cd. + +###### begin Template for 51-multi-boot ###### +# +# It has reasonable combinations of above classes. +# It's a noop until we replace _ with host names. + +#!/bin/bash +if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then + case $HOSTNAME in + # stretch based minimal recovery / bootstraping os: - _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_FREE ;; ++ _) echo STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_FREE ;; + # flidas + _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;; + # etiona + _) echo UBUNTU ETIONA64 VOL_ETIONA ETIONA ;; + # stretch - _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_FREE ;; ++ _) echo STRETCH64 VOL_STRETCH STRETCH_FREE ;; + # buster - _) echo DEBIAN BUSTER64 VOL_BUSTER BUSTER_FREE ;; ++ _) echo BUSTER64 VOL_BUSTER BUSTER_FREE ;; + # testing - _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_FREE ;; ++ _) echo STRETCH64 VOL_TESTING TESTING_FREE ;; + # xenial + _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;; + # bionic + _) echo UBUNTU BIONIC64 VOL_BIONIC BIONIC ;; + # focal + _) echo UBUNTU FOCAL64 VOL_FOCAL FOCAL ;; + esac +fi +###### end Template for 51-multi-boot ###### + +if [[ -e /a/bin/fai/fai-wrapper ]]; then + source /a/bin/distro-functions/src/identify-distros + if isdeb; then + codename=$(debian-codename) + echo ${codename^^} + distro=$(distro-name) + case $distro in + debian) + echo ${distro^^} + # nonfree repo is not going away any time soon due to + # gcc-doc being in nonfree + echo ${codename^^}_NONFREE + ;; + trisquel) + # easier to stay with fai example config if we just call it ubuntu + echo UBUNTU + ;; + esac + fi + case $HOSTNAME in + li|lj) echo "LINODE" ;; + bk|je) echo "NOCRYPT" ;; + esac +fi + - echo FAIBASE STANDARD + +#echo "PARTITION_PROMPT" +#echo REPARTITION + + +if grep ^52:54:00: /sys/class/net/eth0/address &>/dev/null; then + # if our eth0 mac is in the kvm range, we are a vm. + echo "VM" +fi diff --combined fai/config/class/DEBIAN.var index 07632b2,e9a2756..367c2e3 --- a/fai/config/class/DEBIAN.var +++ b/fai/config/class/DEBIAN.var @@@ -1,6 -1,6 +1,7 @@@ --release=buster --apt_cdn=http://deb.debian.org --security_cdn=http://security.debian.org ++# sources are set with fcopy ++#release=buster ++#apt_cdn=http://deb.debian.org ++#security_cdn=http://security.debian.org CONSOLEFONT= KEYMAP=us-latin1 @@@ -13,8 -13,7 +14,8 @@@ MODULESLIST="usbhid psmouse # if you have enough RAM (>2GB) you may want to enable this line. It # also puts /var/cache into a ramdisk. -#FAI_RAMDISKS="$target/var/lib/dpkg $target/var/cache" +# ian: uncommented +FAI_RAMDISKS="$target/var/lib/dpkg $target/var/cache" # if you want to use the faiserver as APT proxy -#APTPROXY=http://faiserver:3142 +# APTPROXY=http://faiserver:3142 diff --combined fai/config/class/UBUNTU.var index 702cb15,a258b6a..6a42495 mode 120000,100644..100644 --- a/fai/config/class/UBUNTU.var +++ b/fai/config/class/UBUNTU.var @@@ -1,1 -1,2 +1,4 @@@ - DEBIAN.var -ubuntumirror=http://archive.ubuntu.com -ubuntudist=focal ++#iank, i define these by classes. commenting ++# to make sure these arent used ++#ubuntumirror=http://archive.ubuntu.com ++#ubuntudist=focal diff --combined fai/config/hooks/updatebase.UBUNTU index 77bc497,2d1161c..e5050cd mode 120000,100755..100755 --- a/fai/config/hooks/updatebase.UBUNTU +++ b/fai/config/hooks/updatebase.UBUNTU @@@ -1,1 -1,30 +1,20 @@@ - updatebase.DEBIAN + #! /bin/bash + -# use external mirror, remove this script when using a mirror from CD - -cat < $target/etc/apt/sources.list -# external mirror -deb $ubuntumirror/ubuntu $ubuntudist main restricted universe multiverse -deb $ubuntumirror/ubuntu $ubuntudist-updates main restricted universe multiverse -deb $ubuntumirror/ubuntu $ubuntudist-security main restricted universe multiverse -EOM - - + # 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 + # overrides /var/lib/dpkg/info/locales.postinst and consults + # /var/lib/locales/supported.d/local instead of the debconf system. (See + # the code in /usr/share/debconf/frontend that prefers locales.config.) This + # 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 ' + . /usr/share/debconf/confmodule + db_version 2.0 + db_get locales/locales_to_be_generated && + mkdir -p /var/lib/locales/supported.d && + echo "$RET" > /var/lib/locales/supported.d/local' && + $ROOTCMD dpkg-reconfigure locales + fi diff --combined fai/config/scripts/DEBIAN/40-misc index 052bfc6,714be55..54ca499 --- a/fai/config/scripts/DEBIAN/40-misc +++ b/fai/config/scripts/DEBIAN/40-misc @@@ -3,22 -3,6 +3,22 @@@ # (c) Thomas Lange, 2001-2016, lange@debian.org # (c) Michael Goetze, 2010-2011, mgoetze@mgoetze.net + +# on ubuntu 16.04 which didn't run this script, some things which didn't +# apply: +# /etc/dpkg/dpkg.cfg.d/fai didn't exist, +# machine-id was already setup. + +# on that system and a debian stretch system, after reboot, +# some things done here don't seem to persist: +# some thin/etc/mtab is symlink somewhere else, +# and mailname is $HOSTNAME.lan + +# the adjtime thing is to support changing the system clock +# from representing UTC (the default) to localtime (windows default). + +# afaik, the only useful thing here for me is setting /etc/hostname + error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code # a list of modules which are loaded at boot time @@@ -49,7 -33,7 +49,7 @@@ if [ ! -f $target/etc/machine-id ]; the > $target/etc/machine-id fi # recreate machine-id if the file is empty - if [ X"$(stat -c '%s' $target/etc/machine-id 2>/dev/null)" = X0 -a -f /bin/systemd-machine-id-setup ]; then + if [ X"$(stat -c '%s' $target/etc/machine-id 2>/dev/null)" = X0 -a -f $target/bin/systemd-machine-id-setup ]; then $ROOTCMD systemd-machine-id-setup fi diff --combined fai/config/scripts/GRUB_PC/10-setup index a78df0c,cbff2d8..85e90d2 --- a/fai/config/scripts/GRUB_PC/10-setup +++ b/fai/config/scripts/GRUB_PC/10-setup @@@ -3,7 -3,6 +3,7 @@@ error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code +set -x set -a # do not set up grub during dirinstall @@@ -36,21 -35,17 +36,21 @@@ f # Check if RAID is used for the boot device if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then + GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE) 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 + for device in $(LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; s/(nvme.+?)p/$1/g; print }' /proc/mdstat); do echo Install grub on /dev/$device $ROOTCMD grub-install --no-floppy "/dev/$device" done else - $ROOTCMD grub-install --no-floppy "$GROOT" - if [ $? -eq 0 ]; then - echo "Grub installed on $BOOT_DEVICE = $GROOT" - fi + for dev in $BOOT_DEVICE; do + GROOT=$($ROOTCMD grub-probe -tdrive -d $dev) + $ROOTCMD grub-install --no-floppy "$GROOT" + if [ $? -eq 0 ]; then + echo "Grub installed on $dev = $GROOT" + fi + done fi $ROOTCMD update-grub diff --combined fai/config/scripts/LAST/50-misc index c2d6b5c,5b34f7b..2b41683 --- a/fai/config/scripts/LAST/50-misc +++ b/fai/config/scripts/LAST/50-misc @@@ -15,15 -15,13 +15,15 @@@ els fi 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 - echo ERROR: Found lvm devices, but the lvm2 package was not installed - error=1 - fi - fi + # i use dm for crypt, not lvm, so this gives false positive. todo, send patch to remove this + # upstream. + # 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 + # echo ERROR: Found lvm devices, but the lvm2 package was not installed + # error=1 + # fi + # fi fi # remove backup files from cfengine, but only if cfengine is installed @@@ -47,9 -45,8 +47,8 @@@ if [ $do_init_tasks -eq 1 ] ; the fi # Make sure everything is configured properly -if ifclass DEBIAN ; then +if ifclass DEBIAN || ifclass UBUNTU; then - echo "Running \"apt-get -f install\" for the last time." - $ROOTCMD apt-get -f install + $ROOTCMD apt-get -f install -y fi if [ $FAI_ACTION = "install" ]; then @@@ -75,7 -72,7 +74,7 @@@ setrel() return fi - dists="jessie stretch buster bullseye bookworm bionic xenial trusty" + dists="jessie stretch buster bullseye bookworm focal bionic xenial trusty" for d in $dists; do if grep -iq $d $target/etc/os-release; then release=$d diff --combined fai/config/scripts/UBUNTU/90-apt index 682d572,4da7029..440ffb2 --- a/fai/config/scripts/UBUNTU/90-apt +++ b/fai/config/scripts/UBUNTU/90-apt @@@ -1,7 -1,11 +1,16 @@@ #! /bin/bash - # ian: just taking part of the corresponding fai example script ++# iank: we already set mirrors, i dont want to have to add "external mirror" ++# to every sources.list. Leaving the rest of this file so future merges will flag up ++# changes easier ++exit 0 + - ainsl -v /etc/locale.gen '^en_US.UTF-8 UTF-8' - $ROOTCMD locale-gen - $ROOTCMD update-locale LANG=en_US.UTF-8 + # check if we already use an external mirror + grep -q "external mirror" $target/etc/apt/sources.list && exit 0 + + cat < $target/etc/apt/sources.list + # external mirror -deb $ubuntumirror/ubuntu $ubuntudist main restricted universe multiverse -deb $ubuntumirror/ubuntu $ubuntudist-updates main restricted universe multiverse -deb $ubuntumirror/ubuntu $ubuntudist-security main restricted universe multiverse ++deb $ubuntumirror/ubuntu $ubuntudist main universe ++deb $ubuntumirror/ubuntu $ubuntudist-updates main universe ++deb $ubuntumirror/ubuntu $ubuntudist-security main universe + EOM