From 27b85d0b197841f127ee89b40acf78708eb12819 Mon Sep 17 00:00:00 2001 From: Matthias Klumpp Date: Wed, 26 Oct 2016 00:55:32 +0200 Subject: [PATCH] Don't use gfxboot --- config/bootloaders/isolinux/advanced.cfg | 11 ----------- config/bootloaders/isolinux/gfxboot.c32 | 1 - config/bootloaders/isolinux/gfxboot.cfg | 5 ----- config/bootloaders/isolinux/install.cfg | 11 +++++++++++ config/bootloaders/isolinux/isolinux.cfg | 2 -- config/bootloaders/isolinux/menu.cfg | 10 +++++++--- 6 files changed, 18 insertions(+), 22 deletions(-) delete mode 120000 config/bootloaders/isolinux/gfxboot.c32 delete mode 100644 config/bootloaders/isolinux/gfxboot.cfg create mode 100644 config/bootloaders/isolinux/install.cfg diff --git a/config/bootloaders/isolinux/advanced.cfg b/config/bootloaders/isolinux/advanced.cfg index e8c476a..373451a 100644 --- a/config/bootloaders/isolinux/advanced.cfg +++ b/config/bootloaders/isolinux/advanced.cfg @@ -1,18 +1,7 @@ -label install - menu label ^Alternate installation (non-GUI) - linux /install/vmlinuz - initrd /install/initrd.gz - append vga=788 @APPEND_INSTALL@ -- quiet - label hdt menu label ^Hardware Detection Tool (HDT) com32 hdt.c32 -label disctest - menu label Check disc for defects - linux /casper/vmlinuz boot=casper integrity-check quiet splash --- - initrd /casper/initrd.gz - label memtest menu label ^Memory Diagnostic Tool (memtest86+) linux /live/memtest diff --git a/config/bootloaders/isolinux/gfxboot.c32 b/config/bootloaders/isolinux/gfxboot.c32 deleted file mode 120000 index 132d534..0000000 --- a/config/bootloaders/isolinux/gfxboot.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/modules/bios/gfxboot.c32 \ No newline at end of file diff --git a/config/bootloaders/isolinux/gfxboot.cfg b/config/bootloaders/isolinux/gfxboot.cfg deleted file mode 100644 index 29e8bd6..0000000 --- a/config/bootloaders/isolinux/gfxboot.cfg +++ /dev/null @@ -1,5 +0,0 @@ -hidden-timeout=300 -screen-colour=0x2D3335 -label normal=Normal -append normal= -mainmenu.entries=4 diff --git a/config/bootloaders/isolinux/install.cfg b/config/bootloaders/isolinux/install.cfg new file mode 100644 index 0000000..ba09752 --- /dev/null +++ b/config/bootloaders/isolinux/install.cfg @@ -0,0 +1,11 @@ +label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 @APPEND_INSTALL@ --- quiet + +label installgui + menu label ^Graphical install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet diff --git a/config/bootloaders/isolinux/isolinux.cfg b/config/bootloaders/isolinux/isolinux.cfg index 3e8f2a8..a3e3eab 100644 --- a/config/bootloaders/isolinux/isolinux.cfg +++ b/config/bootloaders/isolinux/isolinux.cfg @@ -1,6 +1,4 @@ -path include menu.cfg default vesamenu.c32 -ui gfxboot.c32 bootlogo prompt 0 timeout 0 diff --git a/config/bootloaders/isolinux/menu.cfg b/config/bootloaders/isolinux/menu.cfg index 71ff198..d2daa80 100644 --- a/config/bootloaders/isolinux/menu.cfg +++ b/config/bootloaders/isolinux/menu.cfg @@ -1,12 +1,16 @@ -menu hshift 7 -menu width 60 +menu hshift 0 +menu width 82 menu title Boot menu include stdmenu.cfg include live.cfg +include install.cfg menu begin advanced - menu title ^Advanced options + menu title Advanced options include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit include advanced.cfg menu end