init: more informative syslinux boot message

CoreELEC · Jun 23, 2019 · 3adcb6c · 3adcb6c
1 parent 2d400f1
commit 3adcb6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
@@ -595,7 +595,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
@@ -609,7 +610,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
@@ -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