From 52f9477c32749aee8b3c4ae080a9905e4ae9f3c9 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Mon, 22 Aug 2016 17:01:17 +0200
Subject: add support for text booting and serial console

Also enable HDT.
---
 grub/grub_void.cfg.in    | 14 ++++++++++++--
 isolinux/isolinux.cfg.in | 24 ++++++++++++++----------
 mklive.sh.in             |  6 +++++-
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/grub/grub_void.cfg.in b/grub/grub_void.cfg.in
index a2cda85..8d93417 100644
--- a/grub/grub_void.cfg.in
+++ b/grub/grub_void.cfg.in
@@ -17,8 +17,8 @@ if loadfont "(${voidlive})/boot/grub/fonts/unicode.pf2" ; then
     insmod gfxterm
     set gfxmode="auto"
     
-    terminal_input console
-    terminal_output gfxterm
+    terminal_input console serial
+    terminal_output gfxterm serial
     
     insmod png
     background_image "(${voidlive})/boot/isolinux/@@SPLASHIMAGE@@"
@@ -43,4 +43,14 @@ if [ cpuid -l ]; then
 		locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram
         initrd (${voidlive})/boot/initrd
     }
+    menuentry "@@BOOT_TITLE@@ @@KERNVER@@ (@@ARCH@@) (Serial)" {
+        set gfxpayload="keep"
+        linux (${voidlive})/boot/vmlinuz \
+		root=live:CDLABEL=VOID_LIVE ro init=/sbin/init \
+		rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 gpt add_efi_memmap \
+		vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ \
+		locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram
+                console=tty0 console=ttyS0,115200n8
+        initrd (${voidlive})/boot/initrd
+    }
 fi
diff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in
index 632e907..671b592 100644
--- a/isolinux/isolinux.cfg.in
+++ b/isolinux/isolinux.cfg.in
@@ -1,24 +1,21 @@
-UI vesamenu.c32
+SERIAL 0 115200
+UI menu.c32
 PROMPT 0
 TIMEOUT 100
 ONTIMEOUT linux
 
+MENU TITLE Welcome to the hrmpf rescue system, built on Void Linux
 MENU TABMSG Press ENTER to boot or TAB to edit a menu entry
 MENU AUTOBOOT BIOS default device boot in # second{,s}...
 MENU BACKGROUND @@SPLASHIMAGE@@
 MENU WIDTH 78
 MENU MARGIN 1
-MENU ROWS 8
+MENU ROWS 12
 MENU VSHIFT 2
-MENU TIMEOUTROW 12
-MENU TABMSGROW 2
-MENU CMDLINEROW 15
-MENU HELPMSGROW 21
-MENU HELPMSGENDROW 29
 
-MENU COLOR title        * #FF5255FF *
-MENU COLOR border       * #00000000 #00000000 none
-MENU COLOR sel          * #ffffffff #FF5255FF *
+#MENU COLOR title        * #FF5255FF *
+#MENU COLOR border       * #00000000 #00000000 none
+#MENU COLOR sel          * #ffffffff #FF5255FF *
 
 LABEL linux
 MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@
@@ -28,6 +25,13 @@ LABEL linuxram
 MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ (RAM)
 KERNEL /boot/vmlinuz
 APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram
+LABEL linuxtext
+MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ (Text mode/Serial)
+KERNEL /boot/vmlinuz
+APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ modprobe.blacklist=bochs_drm nomodeset console=tty0 console=ttyS0,115200n8
+LABEL hdt
+MENU LABEL HDT (Hardware Detection Tool)
+KERNEL hdt.c32
 LABEL memtest86+
 MENU LABEL memtest86+ 5.01
 KERNEL memdisk
diff --git a/mklive.sh.in b/mklive.sh.in
index 80f3aad..c387fa7 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -194,10 +194,14 @@ generate_isolinux_boot() {
     cp -f $SYSLINUX_DATADIR/isolinux.bin "$ISOLINUX_DIR"
     cp -f $SYSLINUX_DATADIR/ldlinux.c32 "$ISOLINUX_DIR"
     cp -f $SYSLINUX_DATADIR/libcom32.c32 "$ISOLINUX_DIR"
-    cp -f $SYSLINUX_DATADIR/vesamenu.c32 "$ISOLINUX_DIR"
+    cp -f $SYSLINUX_DATADIR/menu.c32 "$ISOLINUX_DIR"
+    cp -f $SYSLINUX_DATADIR/hdt.c32 "$ISOLINUX_DIR"
     cp -f $SYSLINUX_DATADIR/libutil.c32 "$ISOLINUX_DIR"
+    cp -f $SYSLINUX_DATADIR/libmenu.c32 "$ISOLINUX_DIR"
+    cp -f $SYSLINUX_DATADIR/libgpl.c32 "$ISOLINUX_DIR"
     cp -f $SYSLINUX_DATADIR/chain.c32 "$ISOLINUX_DIR"
     cp -f $SYSLINUX_DATADIR/memdisk "$ISOLINUX_DIR"
+    cp -f /usr/share/hwdata/pci.ids "$ISOLINUX_DIR"
     cp -f isolinux/isolinux.cfg.in "$ISOLINUX_DIR"/isolinux.cfg
     cp -f ${SPLASH_IMAGE} "$ISOLINUX_DIR"
 
-- 
cgit 1.4.1