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

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index c6948e7..7270d65 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -61,6 +61,7 @@ $ROOTCMD apt-get update
 
 
 chroot $FAI_ROOT bash <<'EOF'
+#### begin .ssh setup ###
 set -eE -o pipefail
 mkdir -p /home/iank/.ssh
 f=/root/.ssh/authorized_keys
@@ -75,7 +76,11 @@ find /home/iank/.ssh -xtype l -exec rm '{}' \;
 cp -rL /home/iank/.ssh /root
 chown -R root:root /root/.ssh
 chmod 700 /root/.ssh
+#### end .ssh setup ###
 
+# this is needed to enable resolvconf, making /etc/resolv.conf be a symlink.
+# why? i dun know, it\'s really  dumb.
+dpkg-reconfigure -fnoninteractive resolvconf
 
 # default jessie groups + kvm, systemd-journal, adm
 usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank
@@ -83,22 +88,50 @@ usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank
 if getent group systemd-journal >/dev/null; then
   usermod -aG systemd-journal iank
 fi
+
+
+# this is usefull. Only thing reason I see this being disabled by default is
+# that a normal user can disrupt the system, eg cause a reboot.
+sed -i '$a kernel.sysrq=1
+/^kernel.sysrq=/d' /etc/sysctl.conf
+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
+
+# 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
 
-# this is usefull. Only thing reason I see this being disabled by default is
-# that a normal user can disrupt the system, eg cause a reboot.
-sed -i '$a kernel.sysrq=1
-/^kernel.sysrq=/d' /etc/sysctl.conf
+update-grub2
 EOF
+fi
 
 
 # reading through the groups that iank is in but traci isn't,