X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=7270d65902c34047432fa89a4176508d20df3ad4;hp=ff65eb2e31ba29b2c359bac401b63a0362136e72;hb=c47175685b348735b3440e16851dde2cc39b6f3f;hpb=ac4e0089e245c96a388b8fcdd92fc05da3399694

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index ff65eb2..7270d65 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -100,7 +100,13 @@ EOF
 if [[ $FAI_ACTION != dirinstall ]]; then
 
   cat >$FAI_ROOT/etc/grub.d/40_custom <<'EOF'
-# https://www.coreboot.org/Serial_console
+#!/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
@@ -109,17 +115,21 @@ 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