From d2dd6230bdd903db49ef9fafdf1f2810ecdcc40d Mon Sep 17 00:00:00 2001 From: nospoonuser Date: Sun, 27 May 2018 18:58:59 +0200 Subject: [PATCH] more menu fixes --- scripts/menufunction.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/menufunction.sh b/scripts/menufunction.sh index 9e34523..99892ea 100644 --- a/scripts/menufunction.sh +++ b/scripts/menufunction.sh @@ -72,25 +72,27 @@ fi if [ -n "$PXE_FETCH_FTP" ]; then cat << EOF -label live +label live-ftp menu label ${LIVE_NAME} (FTP) kernel ../live/vmlinuz append initrd=../live/initrd.img boot=live fetch=${PXE_FETCH_FTP}live/filesystem.squashfs TEXT HELP -Boot "${LIVE_NAME}" via ftp. +Boot ${LIVE_NAME} via ftp. ${LIVE_DESC} +ENDTEXT + EOF fi if [ -n "$PXE_FETCH_HTTP" ]; then cat << EOF -label live +label live-http menu label ${LIVE_NAME} (HTTP) kernel ../live/vmlinuz append initrd=../live/initrd.img boot=live fetch=${PXE_FETCH_HTTP}live/filesystem.squashfs TEXT HELP -Boot "${LIVE_NAME}" via http. +Boot ${LIVE_NAME} via http. ${LIVE_DESC} ENDTEXT @@ -100,12 +102,12 @@ fi if [ -n "$PXE_FETCH_TFTP" ]; then cat << EOF -label live +label live-tftp menu label ${LIVE_NAME} (TFTP) kernel ../live/vmlinuz append initrd=../live/initrd.img boot=live fetch=${PXE_FETCH_TFTP}live/filesystem.squashfs TEXT HELP -Boot "${LIVE_NAME}" via tftp, this is the slowest option. +Boot ${LIVE_NAME} via tftp, this is the slowest option. ${DESC_LIVE} ENDTEXT @@ -118,7 +120,7 @@ fi if [ $num -gt 1 ];then cat << EOF -label exit-${dist}-installer +label exit-live-menu menu label Exit menu exit menu end