From: Ian Kelling <iank@fsf.org>
Date: Thu, 4 Jul 2019 03:28:46 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;p=automated-distro-installer

Merge branch 'upstream'

Tested with flidas vm.
---

3d9cc96092cdc8aa05bc95cf83c07bb1af692013
diff --cc fai/config/hooks/instsoft.DEBIAN
index 4119173,35ac306..34e6ebb
--- a/fai/config/hooks/instsoft.DEBIAN
+++ b/fai/config/hooks/instsoft.DEBIAN
@@@ -8,13 -7,12 +8,11 @@@ if [ $FAI_ACTION != "install" -a $FAI_A
  fi
  
  fcopy -Bi /etc/apt/apt.conf.d/force_confdef
 -ainsl -a  /etc/ucf.conf "^conf_force_conffold=YES"
  
- # ian: on flidas this gives an error: update-locale: Error: invalid locale settings:  LANG=en_US.UTF-8
- # # in case the locales are already included inside the base file (Ubuntu)
- # if [ -f $target/usr/sbin/locale-gen ]; then
- #     $ROOTCMD dpkg-reconfigure -fnoninteractive locales
- #     exit
- # fi
+ # in case the locales are already included inside the base file (Ubuntu)
+ if [ -f $target/usr/sbin/locale-gen ]; then
+     exit
+ fi
  
  # if we want to install locales, install them now
  install_packages -l 2>/dev/null | egrep  -q  ' locales|locales '
diff --cc fai/config/package_config/UBUNTU
index 81670da,47e9e73..a2de98e
--- a/fai/config/package_config/UBUNTU
+++ b/fai/config/package_config/UBUNTU
@@@ -23,15 -9,12 +23,13 @@@ PACKAGES install AMD6
  linux-image-generic
  memtest86+
  
 +# duplicated in DEBIAN
  PACKAGES install GRUB_PC
 -grub-pc
 +grub-pc cryptsetup btrfs-tools mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof
 +
  
 -PACKAGES install
 -ubuntu-minimal
 -ubuntu-server
 +PACKAGES install FLIDAS64 XENIAL64
 +linux-image-generic-hwe-8.0
  
- PACKAGES install XORG
- ubuntu-desktop
- ubuntu-standard
- ubuntu-minimal
+ PACKAGES install GERMAN
+ language-pack-gnome-de
diff --cc fai/config/scripts/DEBIAN/30-interface
index 72f04a0,34c98e8..5955f7b
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@@ -1,8 -1,51 +1,54 @@@
  #! /bin/bash
  
 +# modified from upstream fai example
 +error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 +
+ netplan_yaml() {
+     # network configuration using ubuntu's netplan.io
+     local IFNAME="$1"
+     local METHOD="$2"
+     echo     "Generating netplan configuration for $IFNAME ($METHOD)" >&2
+     echo     "# generated by FAI"
+     echo     "network:"
+     echo     "  version: 2"
+     echo     "  renderer: $RENDERER"
+     case "$RENDERER" in
+       networkd)
+         echo     "  ethernets:"
+         echo     "    $IFNAME:"
+         case "$METHOD" in
+           dhcp)
+             echo "      dhcp4: true"
+             ;;
+           static)
+             echo "      addresses: [$CIDR]"
+             echo "      gateway4: $GATEWAYS_1"
+             echo "      nameservers:"
+             echo "        search: [$DOMAIN]"
+             echo "        addresses: [${DNSSRVS// /, }]"
+             ;;
+         esac
+     esac
+ }
+ 
+ iface_stanza() {
+     # classic network configuration using /etc/network/interfaces
+     local IFNAME="$1"
+     local METHOD="$2"
+     echo "Generating interface configuration for $IFNAME ($METHOD)" >&2
+     echo "# generated by FAI"
+     echo "auto $IFNAME"
+     echo "iface $IFNAME inet $METHOD"
+     case "$METHOD" in
+       static)
+         echo "    address $IPADDR"
+         echo "    netmask $NETMASK"
+         echo "    broadcast $BROADCAST"
+         echo "    gateway $GATEWAYS"
+         ;;
+     esac
+ }
+ 
  newnicnames() {
  
      # determine predictable network names only for stretch and above
@@@ -34,52 -72,43 +79,65 @@@
  }
  
  if [ -z "$NIC1" ]; then
-     echo "ERROR: \$NIC1 is not defined. Cannot configure /etc/network/interfaces properly."
+     echo "WARNING: \$NIC1 is not defined. Cannot add ethernet to /etc/network/interfaces."
  fi
- newnicnames
  CIDR=$(ip -o -f inet addr show $NIC1 | awk '{print $4}')
- if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]; then
+ newnicnames
+ 
+ case "$FAI_ACTION" in
+   install|dirinstall)
+     ifclass DHCPC && METHOD=dhcp || METHOD=static
+     ifclass XORG && RENDERER=NetworkManager || RENDERER=networkd
  
-     if ifclass VM; then
+     if [ -d $target/etc/netplan ]; then
+         # Ubuntu >= 17.10 with netplan.io
+         if [ -n "$NIC1" ]; then
+             netplan_yaml $NIC1 $METHOD > $target/etc/netplan/01-${NIC1}.yaml
+         fi
+     elif [ -d $target/etc/network/interfaces.d ]; then
+         # ifupdown >= 0.7.41 (Debian >= 8, Ubuntu >= 14.04)
 -        iface_stanza lo loopback > $target/etc/network/interfaces.d/lo
+ 
 -        if [ -n "$NIC1" -a ! -f $target/etc/NetworkManager/NetworkManager.conf ]; then
 -            iface_stanza $NIC1 $METHOD > $target/etc/network/interfaces.d/$NIC1
 -        fi
++      if ifclass VM; then
 +        # note, this condition would apply to the elif below too,
 +        # but I don't specify a static ip in fai, so not bothering
 +        cat > $target/etc/network/interfaces <<-EOF
 +	# generated by FAI
 +	auto lo $NIC1
 +	iface lo inet loopback
 +	iface $NIC1 inet dhcp
 +EOF
-     else
++      else
 +        cat > $target/etc/network/interfaces <<-EOF
 +        # generated by FAI
 +        auto lo br0
 +        iface lo inet loopback
 +        iface $NIC1 inet manual
 +        # make a bridge by default so we can have bridged vms.
 +        # Some example I read had stp on, but i don't need stp,
 +        # and it causes a vm to fail pxe boot, presumably unless
 +        # you add some delay.
 +        # http://wiki.libvirt.org/page/PXE_boot_%28or_dhcp%29_on_guest_failed
 +        iface br0 inet dhcp
 +          bridge_ports $NIC1
 +          bridge_stp off
 +          bridge_maxwait 0
 +EOF
++      fi
+     else
 -        (
 -            iface_stanza lo loopback
 -            iface_stanza $NIC1 $METHOD
 -        ) > $target/etc/network/interfaces
++      (
++        iface_stanza lo loopback
++        iface_stanza $NIC1 $METHOD
++      ) > $target/etc/network/interfaces
      fi
- elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]; then
-     [ -n "$CIDR" ] && cat > $target/etc/network/interfaces <<-EOF
- 	# generated by FAI
- 	auto lo $NIC1
- 	iface lo inet loopback
- 	iface $NIC1 inet static
- 	  address $CIDR
- 	  gateway $GATEWAYS
- EOF
-     [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
-     if [ ! -L $target/etc/resolv.conf -a -e /etc/resolv.conf ]; then
- 	cp -p /etc/resolv.conf $target/etc
+ 
+     if ! ifclass DHCPC ; then
+         [ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
+         if [ ! -L $target/etc/resolv.conf -a -e /etc/resolv.conf ]; then
+             cp -p /etc/resolv.conf $target/etc
+         fi
      fi
- fi
+     ;;
+ esac
  
  # here fcopy is mostly used, when installing a client for running in a
  # different subnet than during the installation
diff --cc fai/config/scripts/GRUB_PC/10-setup
index 00829e1,5563275..a78df0c
--- a/fai/config/scripts/GRUB_PC/10-setup
+++ b/fai/config/scripts/GRUB_PC/10-setup
@@@ -38,22 -41,11 +43,14 @@@ if [[ $BOOT_DEVICE =~ '/dev/md' ]]; the
  	echo Install grub on /dev/$device
  	$ROOTCMD grub-install --no-floppy "/dev/$device"
      done
- 
- elif [[ $GROOT =~ 'hostdisk' ]]; then
-     for dev in $BOOT_DEVICE; do
-         $ROOTCMD grub-install --no-floppy --modules=part_msdos $dev
-         if [ $? -eq 0 ]; then
-             echo "Grub installed on hostdisk $BOOT_DEVICE"
-         fi
-     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