updates for t11 and fsf

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

diff --git a/fai/config/scripts/DEBIAN/11-iank b/fai/config/scripts/DEBIAN/11-iank
index 9a067b1accea5613c77f45f61d689788dd774826..119f354005ea2e17ca4b1171506470d2bfb6e7a1 100755 (executable)
--- a/fai/config/scripts/DEBIAN/11-iank
+++ b/fai/config/scripts/DEBIAN/11-iank
@@ -8,11 +8,12 @@ if [[ $EUID != 0 ]]; then
   exit 1
 fi
 
-fcopy -riBM /root
+fcopy -riB /root
 
 
 #### misc configurations
 chroot $FAI_ROOT bash <<'EOFOUTER'
+set -x
 if getent group systemd-journal >/dev/null; then
   # makes the journal be saved to disk.
   mkdir -p /var/log/journal
@@ -30,13 +31,15 @@ sed -i '$a kernel.sysrq=1
 
 EOFOUTER
 
+cmdline_extra="$d16_cmdline $fsf_cmdline_extra"
+
 # luks options, see man systemd-cryptsetup-generator
 # all i know is that with luks.crypttab=no, swap still timed out on boot.
 # and with rd.luks.crypttab=no, it works.
 cmdline="rd.luks.crypttab=no net.ifnames=0 $cmdline_extra"
 
-
 chroot $FAI_ROOT bash <<EOF
+set -x
 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
 
@@ -53,6 +56,11 @@ if grep -qF "$cmdline" /etc/default/grub; then
   # already set things, exit
   exit 0
 fi
+
+# required to show vga grub on d16, at least for t11
+echo GRUB_TERMINAL=console >>/etc/default/grub
+
+
 sed -ri 's/^ *GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="$cmdline"/' /etc/default/grub
 sed -ri 's/^ *GRUB_TIMEOUT_STYLE=.*/GRUB_TIMEOUT_STYLE=menu/' /etc/default/grub
 sed -ri 's/^ *GRUB_TIMEOUT=.*/GRUB_TIMEOUT=6/' /etc/default/grub