buster and some fixes

[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 0df904b6cf85f0f6fa3ceb9073058f5c11a8f9da..3bb65ea27aa8d5c1bb1ff3c5bf6cee8c6ea67810 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -27,9 +27,9 @@ EOFOUTER
 # -r = recursive
 # -i = ignore non-matching class warnings, always exit 0
 # -B = no backup files
-fcopy -riB /boot
+fcopy -riBM /boot
 # this is also done by FABASE/10-misc by default.
-fcopy -riB /root
+fcopy -riBM /root
 
 
 src=$FAI/distro-install-common/shadow
@@ -42,7 +42,7 @@ fi
 
 $FAI/distro-install-common/end
 if ifclass VOL_STRETCH_BOOTSTRAP; then
-  fcopy -ri /etc/systemd/system
+  fcopy -riM /etc/systemd/system
   chroot $FAI_ROOT bash <<'EOFOUTER'
 systemctl enable fai_check.service
 EOFOUTER
@@ -52,7 +52,7 @@ fi
 
 # these get copied in an earlier stage by fai, but leaving it here since
 # I run this as a single post-fai script to update things that have changed.
-fcopy -riB /etc/apt
+fcopy -riBM /etc/apt
 # outside of fai, this seems to regularly lead to
 # E: Could not get lock /var/lib/apt/lists/lock - open (11: Resource temporarily unavailable)
 # so add a sleep. 1 sec is probably way more than needed.
@@ -98,23 +98,43 @@ EOF
 
 
 if [[ $FAI_ACTION != dirinstall ]]; then
+
+  cat >$FAI_ROOT/etc/grub.d/40_custom <<'EOF'
+#!/bin/sh
+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.
+
+# https://www.coreboot.org/Serial_console # tty
+# but removed unneeded stuff
+
+serial --speed=115200
+terminal_input --append  serial
+terminal_output --append serial
+EOF
+
    chroot $FAI_ROOT bash <<'EOF'
-   # 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
-   # 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
+# 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
+# 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
 EOF
 fi
 
 
-# reading through the groups that iank is in but traci isn't,
+# 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 traci
+    $ROOTCMD usermod -a -G $g user2
 done