From: Ian Kelling <iank@fsf.org>
Date: Sun, 2 Sep 2018 23:55:44 +0000 (-0400)
Subject: merge upstream, untested
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=11a2db1a576e78f58af7f1e7e4c83422635b630d;p=automated-distro-installer

merge upstream, untested
---

11a2db1a576e78f58af7f1e7e4c83422635b630d
diff --cc fai/config/basefiles/mk-basefile
index 8f2bd4a,2fc0d2a..89360bd
--- 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-2017
+ # Thomas Lange, Uni Koeln, 2011-2018
  # based on the Makefile implementation of Michael Goetze
  #
  # Usage example: mk-basefile -J STRETCH64
@@@ -21,19 -22,21 +21,24 @@@
  # 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,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_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() {
@@@ -250,11 -248,11 +260,11 @@@ ext=ta
  zip=cat
  attributes=
  cleanup=1
- cmd=
+ attributes="--xattrs --selinux --acls"
  
 -while getopts ashzJd:kf: opt ; do
 +while getopts ashzJd:kf:x: 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 ;;
@@@ -290,11 -287,9 +300,11 @@@ case "$target" i
      SLC6_32) slc i386 6 ;;
      SLC6_64) slc amd64 6 ;;
      SLC7_64) slc amd64 7 ;;
 +    BELENOS*|FLIDAS*)
 +        debgeneric $target $MIRROR_TRISQUEL ;;
-     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
diff --cc fai/config/class/50-host-classes
index 161a5de,fc89c1d..356b642
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@@ -5,114 -5,27 +5,114 @@@
  # do not use this if a menu will be presented
  [ "$flag_menu" ] && exit 0
  
 -# use a list of classes for our demo machine
 -case $HOSTNAME in
 -    faiserver)
 -        echo "FAIBASE DEBIAN DEMO FAISERVER" ;;
 -    demohost|client*)
 -        echo "FAIBASE DEBIAN DEMO" ;;
 -    xfcehost)
 -        echo "FAIBASE DEBIAN DEMO XORG XFCE LVM";;
 -    gnomehost)
 -        echo "FAIBASE DEBIAN DEMO XORG GNOME";;
 -    centos)
 -        echo "FAIBASE CENTOS"   # you may want to add class XORG here
 -        ifclass I386 && echo CENTOS6_32  # AFAIK there's no 32bit C7
 -        ifclass AMD64 && echo CENTOS7_64
 -        exit 0 ;; # CentOS does not use the GRUB class
 -    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
 -        exit 0 ;; # CentOS/SLC does not use the GRUB class
 -    *)
 -        echo "FAIBASE DEBIAN DEMO" ;;
 -esac
 +
 +# For multi-boot system.
 +# We check that we aren't in a pxe boot environment.
 +# There is probably a better way to do this.
 +# We check the reverse condition in 51-multi-boot,
 +# and set what os we are installing, but don't check it
 +# into git since it changes regularly.
 +
 +#
 +#
 +# Each host defines following:
 +# The base distro:
 +# UBUNTU, DEBIAN
 +#
 +# The base disto version, only use so far is the basefile name if it exists.
 +# Debian stable basefile gets built by faisetup and gets used otherwise.
 +# With X suffix, means it has gone through the dirinstall process and has eXtra
 +# things installed, to speed up installation.
 +# STRETCH64, XENIAL64, BELENOS64, FLIDAS64, FLIDAS64BIG
 +#
 +# The distro subvol name, we can add as many of these as we want:
 +# VOL_TESTING, VOL_STRETCH, VOL_XENIAL, VOL_BELENOS, VOL_FLIDAS, VOL_STRETCH_BOOTSTRAP
 +# Using VOL_STRETCH_BOOTSTRAP sets up the install to act like a pxe rom if
 +# grub sets a specific var.
 +#
 +# The apt sources files we want,
 +# STRETCH_FREE, STRETCH_NONFREE, TESTING_FREE, TESTING_NONFREE,
 +# XENIAL_FREE, FLIDAS, BELENOS, STRETCH_LINODE.
 +#
 +# It's all a little redundant in some cases, but it keeps things
 +# simpler. Belenos is broken right now, planning to remove it once
 +# flidas is released and rms has upgraded.
 +#
 +#
 +# Other notable classes:
 +#
 +# INSTALL: for autodiscover iso, this is needed. We could also add it to
 +# the autodiscover grub, but then we have to burn a new iso if we want a
 +# non-install one. It sets the class for the corresponding INSTALL.var,
 +# which sets FAI_ACTION=INSTALL. I'm not sure if this variable overrides
 +# FAI_ACTION outside of autodiscover, todo: test it out, if it doesn't,
 +# make install be default in 51-multi-boot, and disable it if needed.
 +#
 +# DESKTOP: install a bunch of extra packages. For creating X suffix
 +# basefiles. See README.
 +#
 +# REPARTITION: we try to reuse partitions/filesystems to install a new
 +# os into a multi-os system, if we see some basic hueristics, like the
 +# right amount of them. This overrides that.
 +#
 +# PARTITION_PROMPT: If we don't see partitions to reuuse, prompt
 +# to make sure we really want to repartition and use a completely
 +# fresh install. I use this in case our repartition check has
 +# a bug in it, or I accidentally set REPARTITION.
 +#
 +# ROTATIONAL: in a system with ssd and hdd, install to the hdd
 +# instead of the default ssd.
 +#
 +# RAID0: Use raid 0 even if there are >= 4 disks with boot partititions.
 +#
 +#
 +# Code in 51-multi-boot, with reasonable combinations of above
 +# uncommented for easier editing, and runs as a noop until
 +# we replace _ with host names.
 +if [[ ! -e /a/bin/fai/fai-wrapper ]]; then
 +    case $HOSTNAME in
 +        # stretch based minimal recovery / bootstraping os:
 +        _) echo DEBIAN STRETCH64 VOL_STRETCH_BOOTSTRAP STRETCH_NONFREE ;;
 +        # flidas
 +        _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
 +        # stretch
 +        _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_NONFREE ;;
 +        # testing
 +        _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_NONFREE ;;
 +        # belenos
 +        _) echo UBUNTU BELENOS64 VOL_BELENOS BELENOS ;;
 +        # xenial
 +        _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;;
 +    esac
 +fi
 +
 +if [[ -e /a/bin/fai/fai-wrapper ]]; then
 +    source /a/bin/distro-functions/src/identify-distros
 +    if isdebian; then
 +        echo "DEBIAN"
 +    fi
 +    if isdebian-stable; then
 +        echo "STRETCH"
 +        case $HOSTNAME in
 +            li|lj) echo "STRETCH_LINODE" ;;
 +            *)
 +                # nonfree repo is not going away any time soon due to
 +                # gcc-doc being in nonfree
 +                echo "STRETCH_NONFREE"
 +                ;;
 +        esac
 +    elif isdebian-testing; then
 +        echo "TESTING_NONFREE"
 +    fi
 +fi
 +
- echo "FAIBASE"
++echo "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 --cc fai/config/class/DEBIAN.var
index 3823152,b7146a7..2ce239b
--- a/fai/config/class/DEBIAN.var
+++ b/fai/config/class/DEBIAN.var
@@@ -10,11 -13,7 +13,9 @@@ 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
 +# ian: uncommented
 +APTPROXY=http://faiserver:3142
- 
- apt_cdn=http://deb.debian.org
diff --cc fai/config/package_config/DEBIAN
index 00d7c8d,539b71f..1c7cc73
--- a/fai/config/package_config/DEBIAN
+++ b/fai/config/package_config/DEBIAN
@@@ -19,35 -36,11 +36,32 @@@ PACKAGES install ARM6
  grub-efi-arm64
  linux-image-arm64
  
- PACKAGES install DHCPC
- isc-dhcp-client
- 
 +# ian: note everything after the grub package should be refactored into
 +# a new class. This line is duplicated in UBUNTU
 +# lsof is used in my btrfs util scritps.
 +# netcat is used for proxy.
 +# resolvconf because if we don't install it now we have to reboot for it to
 +# take effect.
  PACKAGES install GRUB_PC
 -grub-pc
 +grub-pc cryptsetup btrfs-tools mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof
  
  PACKAGES install GRUB_EFI
 -grub-efi
 +grub-efi cryptsetup btrfs-tools mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof
 +
 +
 +#resolvconf because dpkg-reconfigure on it has this message in flidas:
 +# Reboot recommended
 +
 +# Suppliers of name server information such as local caching name servers and interface configurers are expected to supply name server information to the resolvconf program. However, although
 +# installation of the resolvconf package triggers them to supply their information, some of them fail to do so.
 +
 +# This bug would lead to loss of valid name server information on installation of the resolvconf package if the following workaround were not adopted: resolvconf includes the full contents of
 +# the pre-installation /etc/resolv.conf in its database until reboot. This has the drawback that name server information is retained even if the associated interface is later deconfigured.
 +# (This incorrect behavior is judged to be less harmful than the alternative of losing valid information.)
 +
 +# Until the bug in question is fixed and the workaround removed, the only way to ensure that resolvconf has fully correct name server information after the resolvconf package has been
 +# installed on a running system is to reboot the system.
 +
  
  PACKAGES install LVM
  lvm2
diff --cc fai/config/package_config/STANDARD
index 0000000,6760e7d..36bde10
mode 000000,100644..100644
--- a/fai/config/package_config/STANDARD
+++ b/fai/config/package_config/STANDARD
@@@ -1,0 -1,31 +1,30 @@@
+ PACKAGES install-norec
+ 
+ # the list of standard packages, without any libs and a few packages removed
+ apt-listchanges
+ bash-completion
+ bind9-host
+ dbus
+ dnsutils
+ doc-debian
+ file
+ gettext-base
+ groff-base
+ hdparm
+ less
+ locales
+ lsof
+ man-db
+ manpages
+ mime-support
+ ncurses-term
 -netcat-traditional
+ openssh-client
+ pciutils
+ perl
+ python
+ python-minimal
+ reportbug
+ telnet
+ traceroute
+ ucf
+ xz-utils
diff --cc fai/config/package_config/UBUNTU
index 5d60b71,79a6b3c..709311a
--- a/fai/config/package_config/UBUNTU
+++ b/fai/config/package_config/UBUNTU
@@@ -6,14 -6,11 +6,11 @@@ PACKAGES install CHROO
  linux-image-generic-
  
  PACKAGES install AMD64
- linux-image-generic initramfs-tools
+ linux-image-generic
  memtest86+
  
- PACKAGES install DHCPC
- isc-dhcp-client
- 
  PACKAGES install GRUB_PC
 -grub-pc
 +grub-pc cryptsetup btrfs-tools mbuffer bridge-utils netcat-openbsd lsof
  
  PACKAGES install XORG
  ubuntu-desktop