From 2f4b9c16b66198f2e8700c911226a310dc6664ca Mon Sep 17 00:00:00 2001 From: Will Woods Date: Fri, 21 Oct 2011 13:12:43 -0400 Subject: [PATCH] New syslinux config (#734170) Adapted from commit b3301595bc2f047472c59b82ea5432a5c6f1d515. --- share/config_files/isolinux.cfg | 107 ++++++++++++++++++++++++++++++++ share/config_files/syslinux.cfg | 33 ---------- share/x86.tmpl | 10 +-- 3 files changed, 108 insertions(+), 42 deletions(-) create mode 100644 share/config_files/isolinux.cfg delete mode 100644 share/config_files/syslinux.cfg diff --git a/share/config_files/isolinux.cfg b/share/config_files/isolinux.cfg new file mode 100644 index 00000000..0a8d7b65 --- /dev/null +++ b/share/config_files/isolinux.cfg @@ -0,0 +1,107 @@ +default vesamenu.c32 +timeout 600 + +display boot.msg + +# Clear the screen when exiting the menu, instead of leaving the menu displayed. +# For vesamenu, this means the graphical background is still displayed without +# the menu itself for as long as the screen remains in graphics mode. +menu clear +menu background splash.png +menu title @PRODUCT@ @VERSION@ +menu vshift 8 +menu rows 18 +menu margin 8 +#menu hidden +menu helpmsgrow 15 +menu tabmsgrow 13 + +# Border Area +menu color border * #00000000 #00000000 none + +# Selected item +menu color sel 0 #ffffffff #00000000 none + +# Title bar +menu color title 0 #ff7ba3d0 #00000000 none + +# Press [Tab] message +menu color tabmsg 0 #ff3a6496 #00000000 none + +# Unselected menu item +menu color unsel 0 #84b8ffff #00000000 none + +# Selected hotkey +menu color hotsel 0 #84b8ffff #00000000 none + +# Unselected hotkey +menu color hotkey 0 #ffffffff #00000000 none + +# Help text +menu color help 0 #ffffffff #00000000 none + +# A scrollbar of some type? Not sure. +menu color scrollbar 0 #ffffffff #ff355594 none + +# Timeout msg +menu color timeout 0 #ffffffff #00000000 none +menu color timeout_msg 0 #ffffffff #00000000 none + +# Command prompt text +menu color cmdmark 0 #84b8ffff #00000000 none +menu color cmdline 0 #ffffffff #00000000 none + +# Do not display the actual menu unless the user presses a key. All that is displayed is a timeout message. + +menu tabmsg Press Tab for full configuration options on menu items. +menu separator # insert an empty line +menu separator # insert an empty line +label linux + menu label ^Install or upgrade @PRODUCT@ + menu default + kernel vmlinuz + append initrd=initrd.img @ROOT@ quiet +menu separator # insert an empty line +# utilities submenu +menu begin ^Troubleshooting + menu title Troubleshooting +label vesa + menu indent count 5 + menu label Install @PRODUCT@ in ^basic graphics mode. + text help + Try this option out if you're having trouble installing + @PRODUCT@. + endtext + kernel vmlinuz + append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet +label rescue + menu indent count 5 + menu label ^Rescue a @PRODUCT@ system. + text help + If the system will not boot, this lets you access files + and edit config files to try to get it booting again. + endtext + kernel vmlinuz + append initrd=initrd.img @ROOT@ rescue quiet +label memtest + menu label Run a ^memory test. + text help + If your system is having issues, a problem with your + system's memory may be the cause. Use this utility to + see if the memory is working correctly. + endtext + kernel memtest +menu separator # insert an empty line +label local + menu label Boot from ^local drive. + localboot 0xffff +menu separator # insert an empty line +menu separator # insert an empty line +label returntomain + menu label Return to ^main menu. + menu exit +menu end +#label local +# menu label Exit this menu and boot from ^local disk. +# localboot 0xffff + diff --git a/share/config_files/syslinux.cfg b/share/config_files/syslinux.cfg deleted file mode 100644 index 599ad99a..00000000 --- a/share/config_files/syslinux.cfg +++ /dev/null @@ -1,33 +0,0 @@ -default vesamenu.c32 -#prompt 1 -timeout 600 - -display boot.msg - -menu background splash.jpg -menu title Welcome to @PRODUCT@ @VERSION@! -menu color border 0 #ffffffff #00000000 -menu color sel 7 #ffffffff #ff000000 -menu color title 0 #ffffffff #00000000 -menu color tabmsg 0 #ffffffff #00000000 -menu color unsel 0 #ffffffff #00000000 -menu color hotsel 0 #ff000000 #ffffffff -menu color hotkey 7 #ffffffff #ff000000 -menu color scrollbar 0 #ffffffff #00000000 - -label linux - menu label ^Install a new system or upgrade an existing system - menu default - kernel vmlinuz - append initrd=initrd.img @ROOT@ quiet -label vesa - menu label Install system with ^basic video driver - kernel vmlinuz - append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet -label rescue - menu label ^Rescue installed system - kernel vmlinuz - append initrd=initrd.img @ROOT@ rescue quiet -label local - menu label Boot from ^local drive - localboot 0xffff diff --git a/share/x86.tmpl b/share/x86.tmpl index 3d03755f..2bc57cac 100644 --- a/share/x86.tmpl +++ b/share/x86.tmpl @@ -13,7 +13,7 @@ install ${runtime_img} ${LIVEDIR}/squashfs.img mkdir ${BOOTDIR} ${KERNELDIR} install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR} -install ${configdir}/syslinux.cfg ${BOOTDIR}/isolinux.cfg +install ${configdir}/isolinux.cfg ${BOOTDIR}/isolinux.cfg install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png install ${configdir}/boot.msg.x86 ${BOOTDIR}/boot.msg install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR} @@ -23,14 +23,6 @@ replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cf replace @PRODUCT@ ${product.name} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg -%if exists("boot/memtest*"): - install boot/memtest* ${BOOTDIR} - append ${BOOTDIR}/isolinux.cfg "label memtest86" - append ${BOOTDIR}/isolinux.cfg " menu label ^Memory test" - append ${BOOTDIR}/isolinux.cfg " kernel memtest" - append ${BOOTDIR}/isolinux.cfg " append -" -%endif - %for kernel in kernels: %if kernel.flavor: installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}