From ff3887ee113cd619617b15ad1e169f06756ebb03 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 18 Jun 2019 03:06:21 +0100
Subject: [PATCH 1/2] init: more informative syslinux boot message

---
 packages/sysutils/busybox/scripts/init | 5 +++--
 scripts/mkimage                        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 616d552d79..a0a74654ba 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -589,7 +589,8 @@ update_bootmenu() {
         progress "Updating /flash/syslinux.cfg [$crnt_default -> $SYSLINUX_DEFAULT]"
 
         mount -o remount,rw /flash
-        sed -i "s/^DEFAULT .*/DEFAULT $SYSLINUX_DEFAULT/" /flash/syslinux.cfg
+        sed -e "s/^SAY Wait for .* mode/SAY Wait for ${SYSLINUX_DEFAULT} mode/" -i /flash/syslinux.cfg
+        sed -e "s/^DEFAULT .*/DEFAULT $SYSLINUX_DEFAULT/" -i /flash/syslinux.cfg
         rm -f /flash/EFI/BOOT/syslinux.cfg
         mount -o remount,ro /flash
       fi
@@ -603,7 +604,7 @@ update_bootmenu() {
         progress "Updating /flash/EFI/BOOT/grub.cfg [$crnt_default -> \"$GRUB_DEFAULT\"]"
 
         mount -o remount,rw /flash
-        sed -i "s/^set default=.*/set default=\"$GRUB_DEFAULT\"/" /flash/EFI/BOOT/grub.cfg
+        sed -e "s/^set default=.*/set default=\"$GRUB_DEFAULT\"/" -i /flash/EFI/BOOT/grub.cfg
         rm -f /flash/grub.cfg
         mount -o remount,ro /flash
       fi
diff --git a/scripts/mkimage b/scripts/mkimage
index 6e9ef996ce..22dd53b4d2 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -115,7 +115,7 @@ if [ "${BOOTLOADER}" = "syslinux" ]; then
   # create bootloader configuration
   echo "image: creating bootloader configuration..."
   cat << EOF > "${LE_TMP}/syslinux.cfg"
-SAY Wait for installer to start or press <TAB> for more options (live, run)
+SAY Wait for installer mode to start or <TAB> for options (installer, live, run)
 DEFAULT installer
 TIMEOUT 50
 PROMPT 1

From 3388460ac48de0a2d9bca2657726391744b59041 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 18 Jun 2019 18:42:47 +0100
Subject: [PATCH 2/2] image: explain available options

---
 scripts/mkimage | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/mkimage b/scripts/mkimage
index 22dd53b4d2..b8348d8b45 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -115,7 +115,14 @@ if [ "${BOOTLOADER}" = "syslinux" ]; then
   # create bootloader configuration
   echo "image: creating bootloader configuration..."
   cat << EOF > "${LE_TMP}/syslinux.cfg"
-SAY Wait for installer mode to start or <TAB> for options (installer, live, run)
+SAY Wait for installer mode to start automatically in 5 seconds...
+SAY
+SAY Options
+SAY =======
+SAY installer: permanently install ${DISTRO} to HDD/SSD
+SAY live: boot ${DISTRO} using RAM for temporary storage
+SAY run: boot ${DISTRO} using this USB memory device for storage
+SAY
 DEFAULT installer
 TIMEOUT 50
 PROMPT 1