Grub UEFI support

bootfiles/boot/grub/grub-stub.cfg

@@ -0,0 +1,4 @@
+earch --no-floppy --label linux --set root
+set prefix=($root)/boot/grub
+
+configfile /grub.cfg

bootfiles/boot/grub/grub.cfg

@@ -0,0 +1,30 @@
+insmod efi_gop
+insmod efi_uga
+
+insmod gfxterm
+insmod gfxterm_background
+insmod png
+
+insmod all_video
+insmod videotest
+insmod videoinfo
+
+serial --unit 4 --speed 9600
+terminal_output gfxterm
+
+set pager=1
+
+#set color_normal=black/black
+#set color_highlight=black/cyan
+
+background_image -m stretch /linux/boot/bootlogo.png
+
+menuentry --hotkey=l 'Run Linux' {
+   linux /linux/boot/vmlinuz vga=769 load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 apparmor=0
+   initrd /linux/boot/initrfs.img 
+}
+menuentry --hotkey=p 'Run Linux Debug' {
+   linux /linux/boot/vmlinuz vga=769 load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 apparmor=0 debug
+   initrd /linux/boot/initrfs.img 
+}
+

build

@@ -21,12 +21,11 @@ if [ "$(mksquashfs 2>&1 | grep "Xdict-size")" = "" ]; then
    exit 1
 fi
 
-MKISOFS=$(which mkisofs)
-if [ "$MKISOFS" = "" ]; then
-   MKISOFS=$(which genisoimage)
-fi
-if [ "$MKISOFS" = "" ]; then
-   echo "Cannot find mkisofs or genisoimage, stop"
+XORRISO=$(which xorriso)
+ISOHYBRID=$(which isohybrid)
+
+if [[ -z ${XORISO} && -z ${ISOHYBRID} ]]; then
+   echo "Cannot find xorisso and/or isohybrid, stop"
    exit 3
 fi
 
@@ -56,10 +55,11 @@ cat bootfiles/bootinst.bat | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" | sed -r "s:
 cp $VMLINUZ $BOOT/ || exit
 
 # UEFI booting
-mkdir -p $BOOT/EFI/Boot
-cp bootfiles/EFI/Boot/syslinux.efi $BOOT/EFI/Boot/bootx64.efi
-cp bootfiles/EFI/Boot/{ldlinux.e64,menu.c32,libutil.c32,vesamenu.c32,libcom32.c32} $BOOT/EFI/Boot
-cat $BOOT/syslinux.cfg | sed -r "s:/$LIVEKITNAME/boot/vesamenu:vesamenu:" > $BOOT/EFI/Boot/syslinux.cfg
+mkdir -p ${LIVEKITDATA}/EFI/BOOT
+mkdir -p ${LIVEKITDATA}/boot/grub/x86_64-efi
+cp bootfiles/EFI/BOOT/* ${LIVEKITDATA}/EFI/BOOT
+cp bootfiles/boot/grub/grub.cfg ${LIVEKITDATA}/boot/grub
+cp bootfiles/boot/grub/x86_64-efi/*.mod ${LIVEKITDATA}/boot/grub/x86_64-efi
 
 # create compressed 01-core.sb
 COREFS=""
@@ -78,11 +78,14 @@ TARGET=/tmp
 
 cat "$CWD/bootinfo.txt" | fgrep -v "#" | sed -r "s/mylinux/$LIVEKITNAME/" | sed -r "s/\$/\x0D/" > readme.txt
 
-echo cd $LIVEKITDATA '&&' $MKISOFS -o "$TARGET/$LIVEKITNAME-$ARCH.iso" -v -J -R -D -A "$LIVEKITNAME" -V "$LIVEKITNAME" \
--no-emul-boot -boot-info-table -boot-load-size 4 \
--b "$LIVEKITNAME"/boot/isolinux.bin -c "$LIVEKITNAME"/boot/isolinux.boot . \
-> $TARGET/gen_"$LIVEKITNAME"_iso.sh
-chmod o+x $TARGET/gen_"$LIVEKITNAME"_iso.sh
+echo cd $LIVEKITDATA '&&' ${XORRISO} -as mkisofs -o "${TARGET}/${LIVEKITNAME}-${ARCH}.iso" \
+-U -r -v -T -J -joliet-long  -A "${LIVEKITNAME}" -V "${LIVEKITNAME}" -volset "${LIVEKITNAME}" \
+-b "${LIVEKITNAME}/boot/isolinux.bin" -c "${LIVEKITNAME}/boot/boot.cat" \
+-no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot \
+-e /EFI/BOOT/efiboot.img -no-emul-boot .  '&&' \
+${ISOHYBRID} --uefi "${TARGET}/${LIVEKITNAME}-${ARCH}.iso" \
+> ${TARGET}/gen_"${LIVEKITNAME}"_iso.sh
+chmod +x ${TARGET}/gen_"${LIVEKITNAME}"_iso.sh
 
 echo cd $LIVEKITDATA '&&' zip -0 -r "$TARGET/$LIVEKITNAME-$ARCH.zip" '*' \
 > $TARGET/gen_"$LIVEKITNAME"_zip.sh

initramfs/init

@@ -31,7 +31,21 @@ modprobe_everything -v /drivers/net/
 
 # initialize blkid cache file
 init_blkid_cache
-
+                                                                                                                                                      debug_shell
+# If iso is loaded through ventoy, execute ventoy hook script.
+# Creates mapper device: /dev/mapper/ventoy (which is a simlink to /dev/dm-0)
+if [[ -d /ventoy ]]
+then
+    # init_devs must be executed again, otherwise disk devices are not available yet
+    # But these are required for the ventoy disk mount hook
+    . /ventoy/hook/ventoy-hook-lib.sh
+    while [[ $(get_ventoy_disk_name) == "unknown" ]]
+    do
+        init_devs
+    done
+    /ventoy/busybox/sh /ventoy/hook/debian/disk_mount_hook.sh
+fi
+                                                                                                                                                      debug_shell
 # find data dir with filesystem bundles
 DATA="$(find_data 45 "$DATAMNT")"
 check_data_found "$DATA"

initramfs/initramfs_create

@@ -120,6 +120,13 @@ copy_including_deps /$LMK/kernel/drivers/ata
 copy_including_deps /$LMK/kernel/drivers/nvme
 copy_including_deps /$LMK/kernel/drivers/mmc
 
+# Required for running in Hyper-v VM
+copy_including_deps /$LMK/kernel/drivers/input/serio/hyperv-keyboard.*
+copy_including_deps /$LMK/kernel/drivers/scsi/hv_storvsc.ko
+
+# Required for ventoy support
+copy_including_deps /$LMK/kernel/drivers/md
+
 # network support drivers
 if [ "$NETWORK" = "true" ]; then
    # add all known ethernet drivers

tools/uefi_grub.update

@@ -0,0 +1,108 @@
+#! /bin/bash
+
+set -e
+
+# Function to install packages if not installed yet
+function install_package () {
+	if [[ -z `dpkg -l ${1}|grep -E '^ii'` ]]
+	then
+		apt install --yes ${1}
+	fi	
+}
+
+# Check if the script is executed from the bootfiles directory
+if [[ ${PWD/*\/} != "bootfiles" ]]
+then
+	>&2 echo "Error: execute this script from within the bootfiles directory"
+       exit 1 
+fi
+
+# Read config file
+if [[ -e ../config ]]
+then
+	. ../config
+fi
+
+# Ensure that LIVEKITNAME is set, otherwise assing to default value linux
+LVIVEKITNAME=${LIVEKITNAME:="linux"}
+
+
+if [[ -d EFI/BOOT ]] then rm -rf EFI/BOOT; fi
+if [[ -d boot/grub ]] then rm -rf boot/grub; fi
+
+mkdir -p EFI/BOOT
+mkdir -p boot/grub/x86_64-efi
+
+# Ensure that the x86_64 modules are installed
+install_package "grub-efi-amd64-bin"
+
+cp /usr/lib/grub/x86_64-efi/*.mod boot/grub/x86_64-efi/
+
+# Basic grub config included in UEFI boot image
+# Tries to find the cdrom, which should match the value
+# of LIVEKITNAME
+cat << EOF > boot/grub/grub-stub.cfg
+earch --no-floppy --label ${LIVEKITNAME} --set root
+set prefix=(\$root)/boot/grub
+
+configfile /grub.cfg
+EOF
+
+# Generate UEFI boot image with support of the included modules below
+grub-mkimage \
+   -o EFI/BOOT/BOOTX64.EFI \
+   -c boot/grub/grub-stub.cfg \
+   -p /boot/grub \
+   -O x86_64-efi \
+    search iso9660 configfile normal memdisk tar boot linux part_msdos part_gpt \
+    part_apple configfile help loadenv ls reboot chain search_fs_uuid multiboot \
+    fat iso9660 udf ext2 btrfs ntfs reiserfs xfs lvm ata
+
+
+# Generate ESP image, which will contain the the UEFI Boot image
+dd if=/dev/zero of=EFI/BOOT/efiboot.img bs=512 count=2880
+
+# Format the ESP image
+mkfs.msdos -F 12 -n "${LIVEKITNAME^^}" EFI/BOOT/efiboot.img
+
+# Install mtoools, which contain the mmd and mcopy command to direct add
+# directories and files to the ESP image file
+install_package "mtools"
+
+mmd -i EFI/BOOT/efiboot.img ::EFI
+mmd -i EFI/BOOT/efiboot.img ::EFI/BOOT
+mcopy -i EFI/BOOT/efiboot.img  EFI/BOOT/BOOTX64.EFI ::EFI/BOOT/
+
+# Generate grub.cfg
+cat << EOF > boot/grub/grub.cfg
+insmod efi_gop
+insmod efi_uga
+
+insmod gfxterm
+insmod gfxterm_background
+insmod png
+
+insmod all_video
+insmod videotest
+insmod videoinfo
+
+serial --unit 4 --speed 9600
+terminal_output gfxterm
+
+set pager=1
+
+set color_normal=black/black
+set color_highlight=black/cyan
+
+background_image -m stretch /${LIVEKITNAME}/boot/bootlogo.png
+
+menuentry --hotkey=l 'Run Linux' {
+   linux /${LIVEKITNAME}/boot/vmlinuz vga=769 load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 apparmor=0
+   initrd /${LIVEKITNAME}/boot/initrfs.img 
+}
+menuentry --hotkey=p 'Run Linux Debug' {
+   linux /${LIVEKITNAME}/boot/vmlinuz vga=769 load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 apparmor=0 debug
+   initrd /${LIVEKITNAME}/boot/initrfs.img 
+}
+
+EOF