changes for buster linode

[automated-distro-installer] / fai / config / scripts / GRUB_PC / 11-iank

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index 3bb65ea27aa8d5c1bb1ff3c5bf6cee8c6ea67810..45c869d6b17561d4f6307026acbca8cb5656d6d8 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -13,6 +13,7 @@ if ! type -t fcopy &>/dev/null; then
 fi
 
 chroot $FAI_ROOT bash <<'EOFOUTER'
+set -eE -o pipefail
 if getent group systemd-journal >/dev/null; then
   # makes the journal be saved to disk.
   mkdir -p /var/log/journal
@@ -99,9 +100,19 @@ EOF
 
 if [[ $FAI_ACTION != dirinstall ]]; then
 
-  cat >$FAI_ROOT/etc/grub.d/40_custom <<'EOF'
+
+  if ifclass BUSTER_LINODE; then
+    speed=19200
+    # luks.crypttab=no see man systemd-cryptsetup-generator
+    cmdline="luks.crypttab=no console=ttyS0,${speed}n8"
+  else
+    speed=115200
+    cmdline="luks.crypttab=no console=ttyS0,${speed} console=tty0"
+  fi
+
+  cat >$FAI_ROOT/etc/grub.d/40_custom <<EOF
 #!/bin/sh
-exec tail -n +3 $0
+exec tail -n +3 \$0
 # This file provides an easy way to add custom menu entries.  Simply type the
 # menu entries you want to add after this comment.  Be careful not to change
 # the 'exec tail' line above.
@@ -109,32 +120,36 @@ exec tail -n +3 $0
 # https://www.coreboot.org/Serial_console # tty
 # but removed unneeded stuff
 
-serial --speed=115200
+serial --speed=$speed
 terminal_input --append  serial
 terminal_output --append serial
 EOF
 
-   chroot $FAI_ROOT bash <<'EOF'
+
+
+  chroot $FAI_ROOT bash <<EOF
+set -eE -o pipefail
 # https://askubuntu.com/questions/33416/how-do-i-disable-the-boot-splash-screen-and-only-show-kernel-and-boot-text-inst
-# it suggests not having plymouth-theme-ubuntu-text, but
-# making it not installed then kills plymouth, then makes
-# the system not boot.
-sed -ri 's/(^ *GRUB_CMDLINE_LINUX.*)quiet splash/\1/' /etc/default/grub
-
-# todo: not sure, but this might screw up systems without a serial port
-# and thus need a conditional.
-sed -ri 's/^ *GRUB_CMDLINE_LINUX_DEFAULT="/\0console=ttyS0,115200 console=tty0 /' /etc/default/grub
+# we remove quiet and splash, and all thats left is what we want
+
+sed -ri 's/^ *GRUB_CMDLINE_LINUX_DEFAULT=.*"/GRUB_CMDLINE_LINUX_DEFAULT="$cmdline"/' /etc/default/grub
 # on xenial, no grub is displayed at all. fix that.
 # found just by noticing this in the config file, and a
 # warning about it in error.log
 sed -i '/^ *GRUB_HIDDEN_TIMEOUT/d' /etc/default/grub
 
 update-grub2
+
+# Just include all of them for now incase we are creating
+# an install for a different machine.. in distro-begin, we
+# slim it down to whats used.
+find /lib/modules/*/kernel/drivers/net /lib/modules/*/kernel/net -type f -name '*.ko' -printf "%f\n" | sed 's/.ko$//' | sort -u >/etc/initramfs-tools/modules
+update-initramfs -u -k all
 EOF
 fi
 
 
 # reading through the groups that iank is in but user2 isn't,
 for g in plugdev audio video cdrom; do
-    $ROOTCMD usermod -a -G $g user2
+  $ROOTCMD usermod -a -G $g user2
 done