diff options
author | Raphaël Hertzog <raphael@offensive-security.com> | 2020-01-23 16:47:04 +0100 |
---|---|---|
committer | Raphaël Hertzog <raphael@offensive-security.com> | 2020-01-23 16:47:04 +0100 |
commit | 21272834943e40edc6772fcac391cba35a3b00fd (patch) | |
tree | bdea35720a07060e635b58eea3b0b3a3b636f4f4 | |
parent | be5aaa0c51ffda29eda3367ea4f7f699dde5e9b2 (diff) | |
download | vyos-live-build-21272834943e40edc6772fcac391cba35a3b00fd.tar.gz vyos-live-build-21272834943e40edc6772fcac391cba35a3b00fd.zip |
Standardize on having the GUI installation first in boot menus
debian-cd changed it that way, we already have it that way in EFI
boot, let's be consistent.
-rwxr-xr-x | scripts/build/binary_grub-legacy | 8 | ||||
-rw-r--r-- | share/bootloaders/extlinux/install.cfg | 12 | ||||
-rw-r--r-- | share/bootloaders/isolinux/install.cfg | 12 | ||||
-rw-r--r-- | share/bootloaders/pxelinux/install.cfg | 12 | ||||
-rw-r--r-- | share/bootloaders/syslinux/install.cfg | 12 |
5 files changed, 28 insertions, 28 deletions
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy index fea9b7b6a..181e68ada 100755 --- a/scripts/build/binary_grub-legacy +++ b/scripts/build/binary_grub-legacy @@ -215,14 +215,14 @@ then INITRD_GI="install/gtk/initrd.gz" APPEND_GI="video=vesa:ywrap,mtrr vga=788" - if [ -f "binary/${VMLINUZ_DI}" ] && [ -f "binary/${INITRD_DI}" ] + if [ -f "binary/${VMLINUZ_GI}" ] && [ -f "binary/${INITRD_GI}" ] then - Grub_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}" + Grub_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}" fi - if [ -f "binary/${VMLINUZ_GI}" ] && [ -f "binary/${INITRD_GI}" ] + if [ -f "binary/${VMLINUZ_DI}" ] && [ -f "binary/${INITRD_DI}" ] then - Grub_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}" + Grub_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}" fi fi diff --git a/share/bootloaders/extlinux/install.cfg b/share/bootloaders/extlinux/install.cfg index ba0975215..f56b7f924 100644 --- a/share/bootloaders/extlinux/install.cfg +++ b/share/bootloaders/extlinux/install.cfg @@ -1,11 +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 + +label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 @APPEND_INSTALL@ --- quiet diff --git a/share/bootloaders/isolinux/install.cfg b/share/bootloaders/isolinux/install.cfg index ba0975215..f56b7f924 100644 --- a/share/bootloaders/isolinux/install.cfg +++ b/share/bootloaders/isolinux/install.cfg @@ -1,11 +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 + +label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 @APPEND_INSTALL@ --- quiet diff --git a/share/bootloaders/pxelinux/install.cfg b/share/bootloaders/pxelinux/install.cfg index ba0975215..f56b7f924 100644 --- a/share/bootloaders/pxelinux/install.cfg +++ b/share/bootloaders/pxelinux/install.cfg @@ -1,11 +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 + +label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 @APPEND_INSTALL@ --- quiet diff --git a/share/bootloaders/syslinux/install.cfg b/share/bootloaders/syslinux/install.cfg index ba0975215..f56b7f924 100644 --- a/share/bootloaders/syslinux/install.cfg +++ b/share/bootloaders/syslinux/install.cfg @@ -1,11 +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 + +label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 @APPEND_INSTALL@ --- quiet |