Updating UEFI ISO to use Grub2 instead of pxelinux

8 files changed, 202 insertions, 215 deletions

diff --git a/src/distros/slackware/cfg.footer.iso.efi b/src/distros/slackware/cfg.footer.iso.efi
new file mode 100644
index 0000000..7e9861c
--- /dev/null
+++ b/src/distros/slackware/cfg.footer.iso.efi
@@ -0,0 +1,2 @@
+}
+
diff --git a/src/distros/slackware/cfg.header.iso.efi b/src/distros/slackware/cfg.header.iso.efi
new file mode 100644
index 0000000..2926eff
--- /dev/null
+++ b/src/distros/slackware/cfg.header.iso.efi
@@ -0,0 +1,2 @@
+
+submenu "Slackware Linux Installers" {
diff --git a/src/distros/slackware/cfg.label.iso.efi b/src/distros/slackware/cfg.label.iso.efi
new file mode 100644
index 0000000..a6163a9
--- /dev/null
+++ b/src/distros/slackware/cfg.label.iso.efi
@@ -0,0 +1,7 @@
+   menuentry "Slackware Linux @VERSION@ Install (@CODENAME@ bits)" {
+      echo   "Loading /boot/slack@ARCH@/@VERSION@/bzImage ..."
+      linux  /boot/slack@ARCH@/@VERSION@/bzImage \
+             load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0  nomodeset
+      echo   "Loading /boot/slack@ARCH@/@VERSION@/initrd ..."
+      initrd /boot/slack@ARCH@/@VERSION@/initrd
+   }
diff --git a/src/grub/Makefile.grub b/src/grub/Makefile.grub
new file mode 100644
index 0000000..fabc88d
--- /dev/null
+++ b/src/grub/Makefile.grub
@@ -0,0 +1,125 @@
+#
+#   IP Engineering Rescue Disk
+#   Copyright (C) 2018 David M. Syzdek <david@syzdek.net>.
+#
+#   @SYZDEK_BSD_LICENSE_START@
+#
+#   Redistribution and use in source and binary forms, with or without
+#   modification, are permitted provided that the following conditions are
+#   met:
+#
+#      * Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#      * Redistributions in binary form must reproduce the above copyright
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
+#      * Neither the name of David M. Syzdek nor the
+#        names of its contributors may be used to endorse or promote products
+#        derived from this software without specific prior written permission.
+#
+#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+#   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+#   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M. SYZDEK BE LIABLE FOR
+#   ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+#   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+#   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+#   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+#
+#   @SYZDEK_BSD_LICENSE_END@
+#
+
+
+CLEANFILES              += boot/grub
+GRUB_CONFIGS            = \
+                          boot/grub/grub.cfg
+GRUB_INCLUDES           = \
+                          var/config/grub.inc
+GRUB_BINARIES           = \
+                          EFI/BOOT/efiboot.img
+GRUB_MODULES            = \
+                          efi_gop efi_uga \
+                          all_video video video_bochs video_cirrus video_fb \
+                          videoinfo \
+                          serial terminfo terminal \
+                          search search_fs_file search_fs_uuid search_label \
+                          udf iso9660 ext2 fat exfat ntfs hfsplus lvm \
+                          part_gpt part_msdos msdospart \
+                          diskfilter \
+                          parttool \
+                          probe \
+                          normal \
+                          acpi ohci uhci ahci ehci \
+                          cat ls chain configfile echo halt reboot \
+                          ls lsefimmap lsefisystab lsmmap lspci lsacpi lssal \
+                          linux
+
+
+var/config/grub.inc: Makefile.config $(SYSLINUX_INC_DEPS)
+        bash ./src/scripts/genfiles.sh "$(@)"
+        @touch "$(@)"
+
+
+boot/grub/grub.cfg: Makefile var/config/grub.inc src/grub/grub-header.cfg
+        @mkdir -p boot/grub
+        cat \
+           src/grub/grub-header.cfg \
+           var/config/grub.inc \
+           > "$(@)" \
+           || { rm -f "$(@)"; exit 1; }
+        @touch "$(@)"
+
+
+boot/grub/images/bootia32.efi: Makefile
+        @mkdir -p boot/grub/images
+        grub-mkimage \
+           -o "$(@)" \
+           -c src/grub/grub-stub.cfg \
+           -p /boot/grub \
+           -O i386-efi \
+           $(GRUB_MODULES)
+
+
+boot/grub/images/bootx64.efi: Makefile
+        @mkdir -p boot/grub/images
+        grub-mkimage \
+           -o "$(@)" \
+           -c src/grub/grub-stub.cfg \
+           -p /boot/grub \
+           -O x86_64-efi \
+           $(GRUB_MODULES)
+
+
+EFI/BOOT/efiboot.img: boot/grub/images/bootia32.efi boot/grub/images/bootx64.efi
+        @rm -f "$(@)"
+        dd \
+           if=/dev/zero \
+           of="$(@)" \
+           bs=512 \
+           count=2880 \
+           || { rm -f "$(@)"; exit 1; }
+        mkfs.msdos \
+           -F 12 \
+           -n 'EFIBOOT' \
+           "$(@)" \
+           || { rm -f $(@); exit 1; }
+        mmd \
+           -i "$(@)" \
+           ::EFI \
+           || { rm -f $(@); exit 1; }
+        mmd \
+           -i "$(@)" \
+           ::EFI/BOOT \
+           || { rm -f $(@); exit 1; }
+        mcopy \
+           -i "$(@)" \
+           boot/grub/images/bootx64.efi \
+           ::EFI/BOOT/BOOTX64.EFI \
+           || { rm -f $(@); exit 1; }
+        @touch "$(@)"
+
+
+# end of makefile
diff --git a/src/grub/grub-header.cfg b/src/grub/grub-header.cfg
new file mode 100644
index 0000000..f3caa57
--- /dev/null
+++ b/src/grub/grub-header.cfg
@@ -0,0 +1,39 @@
+
+# configure serial console
+serial --unit 0 --speed 9600
+terminal_input  serial console
+terminal_output serial console
+
+# enable pager (when displaying text files)
+set pager=1
+
+# customize terminal
+terminfo -u serial vt100-color
+set menu_color_normal="white/blue"
+set menu_color_highlight="white/light-gray"
+
+# load partition modules
+insmod part_gpt
+insmod part_msdos
+insmod msdospart
+insmod lvm
+insmod diskfilter
+insmod parttool
+insmod probe
+
+# Grub options
+submenu --hotkey=g "Grub 2 (UEFI/ISO)" {
+   menuentry --hotkey=p 'List ACPI' {
+      lsacpi
+   }
+   menuentry --hotkey=p 'List PCI' {
+      lspci
+   }
+   menuentry --hotkey=r 'Reboot' {
+      reboot
+   }
+   menuentry --hotkey=h 'Halt' {
+      halt
+   }
+}
+
diff --git a/src/grub/grub-stub.cfg b/src/grub/grub-stub.cfg
new file mode 100644
index 0000000..dd1f9ff
--- /dev/null
+++ b/src/grub/grub-stub.cfg
@@ -0,0 +1,15 @@
+
+insmod all_video
+insmod efi_gop
+insmod efi_uga
+insmod video_bochs
+insmod video_cirrus
+
+insmod iso9660
+insmod udf
+
+search --no-floppy --label IPEngRescueDisk --set root
+set prefix=($root)/boot/grub
+
+configfile /boot/grub/grub.cfg
+
diff --git a/src/scripts/genfiles.sh b/src/scripts/genfiles.sh
index 81cf4af..c257c34 100755
--- a/src/scripts/genfiles.sh
+++ b/src/scripts/genfiles.sh
@@ -173,9 +173,8 @@ case "${REGEN_FILE}" in
 
    all);;
    makefile.config);;
+   var/config/grub.inc);;
    var/config/isolinux.inc);;
-   var/config/isolia32.inc);;
-   var/config/isolx64.inc);;
    var/config/pxelinux.inc);;
    var/config/pxelia32.inc);;
    var/config/pxelx64.inc);;
@@ -186,9 +185,8 @@ case "${REGEN_FILE}" in
    *)
    echo "Usage: ${PROG_NAME} all"                     1>&2
    echo "       ${PROG_NAME} Makefile.config"         1>&2
+   echo "       ${PROG_NAME} var/config/grub.inc"     1>&2
    echo "       ${PROG_NAME} var/config/isolinux.inc" 1>&2
-   echo "       ${PROG_NAME} var/config/isolia32.inc" 1>&2
-   echo "       ${PROG_NAME} var/config/isolx64.inc"  1>&2
    echo "       ${PROG_NAME} var/config/pxelinux.inc" 1>&2
    echo "       ${PROG_NAME} var/config/pxelia32.inc" 1>&2
    echo "       ${PROG_NAME} var/config/pxelx64.inc"  1>&2
@@ -204,9 +202,8 @@ esac
 if test "x${REGEN_FILE}" = "xall";then
    REGEN_FILE=""
    REGEN_FILE="${REGEN_FILE} makefile.config"
+   REGEN_FILE="${REGEN_FILE} var/config/grub.inc"
    REGEN_FILE="${REGEN_FILE} var/config/isolinux.inc"
-   REGEN_FILE="${REGEN_FILE} var/config/isolia32.inc"
-   REGEN_FILE="${REGEN_FILE} var/config/isolx64.inc"
    REGEN_FILE="${REGEN_FILE} var/config/pxelinux.inc"
    REGEN_FILE="${REGEN_FILE} var/config/pxelia32.inc"
    REGEN_FILE="${REGEN_FILE} var/config/pxelx64.inc"
@@ -223,33 +220,23 @@ for FILE in ${REGEN_FILE};do
          || exit 1
       ;;
 
-      var/config/isolinux.inc)
-      generate_cfg \
-         isolinux.inc \
-         "cfg.header" \
-         "cfg.label cfg.label.iso" \
-         "cfg.footer" \
-         "broken.iso" \
-         || exit 1;
-      ;;
-
-      var/config/isolia32.inc)
+      var/config/grub.inc)
       generate_cfg \
-         isolia32.inc \
+         grub.inc \
          "cfg.header.iso.efi" \
          "cfg.label.iso.efi" \
          "cfg.footer.iso.efi" \
-         "broken.iso broken.efi broken.efi32" \
+         "broken.iso broken.efi" \
          || exit 1;
       ;;
 
-      var/config/isolx64.inc)
+      var/config/isolinux.inc)
       generate_cfg \
-         isolx64.inc \
-         "cfg.header.iso.efi" \
-         "cfg.label.iso.efi" \
-         "cfg.footer.iso.efi" \
-         "broken.iso broken.efi broken.efi64" \
+         isolinux.inc \
+         "cfg.header" \
+         "cfg.label cfg.label.iso" \
+         "cfg.footer" \
+         "broken.iso" \
          || exit 1;
       ;;
 
diff --git a/src/scripts/iso-efiboot.sh b/src/scripts/iso-efiboot.sh
deleted file mode 100644
index f3e5d68..0000000
--- a/src/scripts/iso-efiboot.sh
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/bin/bash
-#
-#   IP Engineering Rescue Disk
-#   Copyright (C) 2018 David M. Syzdek <david@syzdek.net>.
-#
-#   @SYZDEK_BSD_LICENSE_START@
-#
-#   Redistribution and use in source and binary forms, with or without
-#   modification, are permitted provided that the following conditions are
-#   met:
-#
-#      * Redistributions of source code must retain the above copyright
-#        notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-#      * Neither the name of David M. Syzdek nor the
-#        names of its contributors may be used to endorse or promote products
-#        derived from this software without specific prior written permission.
-#
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-#   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-#   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-#   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M. SYZDEK BE LIABLE FOR
-#   ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-#   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-#   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-#   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-#   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-#
-#   @SYZDEK_BSD_LICENSE_END@
-#
-
-# +-=-=-=-=-=-+
-# |           |
-# |  Headers  |
-# |           |
-# +-=-=-=-=-=-+
-
-# set PROG_NAME and load profile
-PROG_NAME="$(basename "${0}")"
-IPERD_PROFILE="$(dirname "${0}")/iperd.profile"
-if test ! -f "${IPERD_PROFILE}";then
-   echo "${PROG_NAME}: unable to find iperd.profile" 1>&2;
-   exit 1;
-fi
-. "${IPERD_PROFILE}"
-
-
-# +-=-=-=-=-=-=-+
-# |             |
-# |  Functions  |
-# |             |
-# +-=-=-=-=-=-=-+
-
-cleanup()
-{
-   # unmount image
-   if test ! -z "${MKTEMP}";then
-      mount | grep "${MKTEMP}" && sudo umount -f "${MKTEMP}"
-      rm -Rf "${MKTEMP}"
-      unset MKTEMP
-   fi
-
-   # remove loop dev
-   test -z "${LOOPDEV}" || sudo losetup -d "${LOOPDEV}"
-   unset LOOPDEV
-}
-
-
-exit_witherr()
-{
-   cleanup
-   rm -f "${OUTPUT}"
-   exit 1
-}
-
-
-usage()
-{
-   printf "Usage: %s [OPTIONS] <file>\n" "$PROG_NAME"
-   printf "OPTIONS:\n"
-   printf "   -h            display this message\n"
-   printf "   -q            quiet\n"
-   printf "   -v            verbose\n"
-   printf "\n"
-}
-
-
-# +-=-=-=-=-=-=-+
-# |             |
-# |  Main Body  |
-# |             |
-# +-=-=-=-=-=-=-+
-
-# set defaults
-unset VERBOSE
-unset MKTEMP
-
-
-# parse CLI arguments
-while getopts :hqs:t:v OPT; do
-   case ${OPT} in
-      h) usage; exit 0;;
-      v) VERBOSE="1";;
-      q) unset VERBOSE;;
-      ?)
-         echo "${PROG_NAME}: illegal option -- ${OPTARG}" 1>&2
-         echo "Try '${PROG_NAME} -h' for more information." 1>&2
-         exit 1;
-      ;;
-      *)
-      ;;
-   esac
-done
-shift "$((OPTIND-1))"
-OUTPUT="${1}"
-
-
-# check configuration options
-if test -z "${OUTPUT}";then
-   echo "${PROG_NAME}: missing file"
-   echo "Try '${PROG_NAME} -h' for more information." 1>&2
-   exit 1
-fi
-
-
-# check for required files/directories/devices
-for FILE in "${BASEDIR}/EFI/BOOT/BOOTX64.EFI" "${BASEDIR}/EFI/BOOT/BOOTIA32.EFI" \
-            "${BASEDIR}/EFI/BOOT/ldlinux.e32" "${BASEDIR}/EFI/BOOT/ldlinux.e64" \
-            "${BASEDIR}/EFI/BOOT/isolia32.cfg" "${BASEDIR}/EFI/BOOT/isolx64.cfg";do
-   if test ! -f "${FILE}";then
-      echo "${PROG_NAME}: $(basename "${FILE}"): file not found"
-      exit 1
-   fi
-done
-if test -f "${OUTPUT}";then
-   echo "${PROG_NAME}: ${OUTPUT}: already exists"
-   exit 1
-fi
-
-
-# set up exit traps
-trap exit_witherr SIGHUP SIGINT SIGTERM
-trap cleanup EXIT
-
-
-# create empty 1900MB disk image
-dd \
-   if=/dev/zero \
-   of="${OUTPUT}" \
-   count=2880 \
-   bs=512 \
-   || { rm -f "${OUTPUT}"; exit 1; }
-
-
-# create file-system
-mkfs.msdos -F 12 -n 'EFIBOOT' "${OUTPUT}" || { rm -f "${OUTPUT}"; exit 1; }
-
-
-# set up loop block device
-LOOPDEV=$(sudo losetup -P -f --show "${OUTPUT}")
-if test -z "${LOOPDEV}";then
-   rm -f "${OUTPUT}"
-   exit 1
-fi
-
-
-# mount disk image
-MKTEMP="$(mktemp -d -p "${BASEDIR}/tmp" efiboot.XXXXXX)"
-if test -z "${MKTEMP}";then
-   rm -f "${OUTPUT}"
-   exit 1
-fi
-sudo mount -o rw,uid=${USER} ${LOOPDEV} "${MKTEMP}" || exit_witherr
-
-
-# create directory structure and copy files
-mkdir -p "${MKTEMP}/EFI/BOOT/" || exit_witherr
-cp "${BASEDIR}/EFI/BOOT/BOOTX64.EFI"   "${MKTEMP}/EFI/BOOT/"             || exit_witherr
-cp "${BASEDIR}/EFI/BOOT/BOOTIA32.EFI"  "${MKTEMP}/EFI/BOOT/"             || exit_witherr
-cp "${BASEDIR}/EFI/BOOT/ldlinux.e32"   "${MKTEMP}/EFI/BOOT/"             || exit_witherr
-cp "${BASEDIR}/EFI/BOOT/ldlinux.e64"   "${MKTEMP}/EFI/BOOT/"             || exit_witherr
-cp "${BASEDIR}/EFI/BOOT/isolia32.cfg"  "${MKTEMP}/EFI/BOOT/syslia32.cfg" || exit_witherr
-cp "${BASEDIR}/EFI/BOOT/isolx64.cfg"   "${MKTEMP}/EFI/BOOT/syslx64.cfg"  || exit_witherr
-
-
-# end of script