From 21272834943e40edc6772fcac391cba35a3b00fd Mon Sep 17 00:00:00 2001
From: Raphaël Hertzog <raphael@offensive-security.com>
Date: Thu, 23 Jan 2020 16:47:04 +0100
Subject: 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.
---
 scripts/build/binary_grub-legacy       |  8 ++++----
 share/bootloaders/extlinux/install.cfg | 12 ++++++------
 share/bootloaders/isolinux/install.cfg | 12 ++++++------
 share/bootloaders/pxelinux/install.cfg | 12 ++++++------
 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
-- 
cgit v1.2.3