Hi,
Le mercredi, 10 septembre 2014, 00.18:14 Cyril Brulebois a écrit :
> Some things got set into motion, like syslinux menu overhaul (mainly
> discussion around the switch to graphical by default, didn't see any
> patch yet) …
My current work is attached, I wanted to cleanup the things (swap amd64
and i386, mention 32 bits for i386, let amd64 be default) before
attacking the enhanced multiarch question, for which I have successfully
tested ifcpu64.c32 . I've been VAC two weeks but will be returning to
Debian matters in the next days. If someone could comment on these
patches (and/or their primary intent), that'd be a useful base for the
further overhaul.
Thanks for your push towards more releases though!
Cheers,
OdyX
>From 1fdd8e3d19f3de3fb220ca1e4ddd2d007f046344 Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Fri, 29 Aug 2014 21:16:01 -0400
Subject: [PATCH 1/2] Swap amd64 and i386 to let the first be the norm and the
latter be the special case
---
build/boot/x86/386adgtk.cfg | 12 ++++++++++++
build/boot/x86/386adtxt.cfg | 9 +++++++++
build/boot/x86/386gtk.cfg | 4 ++++
build/boot/x86/386rqgtk.cfg | 4 ++++
build/boot/x86/386rqtxt.cfg | 4 ++++
build/boot/x86/386spgtk.cfg | 4 ++++
build/boot/x86/386spk.cfg | 4 ++++
build/boot/x86/386txt.cfg | 6 ++++++
build/boot/x86/adgtk.cfg | 15 ++++++---------
build/boot/x86/adtxt.cfg | 15 +++++++++------
build/boot/x86/amdadgtk.cfg | 9 ---------
build/boot/x86/amdadtxt.cfg | 12 ------------
build/boot/x86/amdgtk.cfg | 4 ----
build/boot/x86/amdrqgtk.cfg | 4 ----
build/boot/x86/amdrqtxt.cfg | 4 ----
build/boot/x86/amdspgtk.cfg | 4 ----
build/boot/x86/amdspk.cfg | 4 ----
build/boot/x86/amdtxt.cfg | 6 ------
build/boot/x86/desktop/386agdt.cfg | 11 +++++++++++
build/boot/x86/desktop/386atdt.cfg | 8 ++++++++
build/boot/x86/desktop/386gtkdt.cfg | 4 ++++
build/boot/x86/desktop/adgtkdt.cfg | 11 ++++-------
build/boot/x86/desktop/adtxtdt.cfg | 11 +++++++----
build/boot/x86/desktop/amdagdt.cfg | 8 --------
build/boot/x86/desktop/amdatdt.cfg | 11 -----------
build/boot/x86/desktop/amdgtkdt.cfg | 4 ----
build/boot/x86/desktop/amdspkdt.cfg | 4 ++--
build/boot/x86/desktop/amdtxtdt.cfg | 4 ++--
build/boot/x86/desktop/amspgtdt.cfg | 4 ++--
build/boot/x86/desktop/gtkdt.cfg | 4 ++--
build/boot/x86/desktop/spkdt.cfg | 4 ++--
build/boot/x86/desktop/spkgtkdt.cfg | 4 ++--
build/boot/x86/desktop/txtdt.cfg | 4 ++--
build/boot/x86/gtk.cfg | 6 +++---
build/boot/x86/menu.cfg | 12 ++++++------
build/boot/x86/rqgtk.cfg | 6 +++---
build/boot/x86/rqtxt.cfg | 6 +++---
build/boot/x86/spk.cfg | 6 +++---
build/boot/x86/spkgtk.cfg | 6 +++---
build/boot/x86/txt.cfg | 10 +++++-----
build/config/x86.cfg | 6 +++---
41 files changed, 139 insertions(+), 139 deletions(-)
create mode 100644 build/boot/x86/386adgtk.cfg
create mode 100644 build/boot/x86/386adtxt.cfg
create mode 100644 build/boot/x86/386gtk.cfg
create mode 100644 build/boot/x86/386rqgtk.cfg
create mode 100644 build/boot/x86/386rqtxt.cfg
create mode 100644 build/boot/x86/386spgtk.cfg
create mode 100644 build/boot/x86/386spk.cfg
create mode 100644 build/boot/x86/386txt.cfg
delete mode 100644 build/boot/x86/amdadgtk.cfg
delete mode 100644 build/boot/x86/amdadtxt.cfg
delete mode 100644 build/boot/x86/amdgtk.cfg
delete mode 100644 build/boot/x86/amdrqgtk.cfg
delete mode 100644 build/boot/x86/amdrqtxt.cfg
delete mode 100644 build/boot/x86/amdspgtk.cfg
delete mode 100644 build/boot/x86/amdspk.cfg
delete mode 100644 build/boot/x86/amdtxt.cfg
create mode 100644 build/boot/x86/desktop/386agdt.cfg
create mode 100644 build/boot/x86/desktop/386atdt.cfg
create mode 100644 build/boot/x86/desktop/386gtkdt.cfg
delete mode 100644 build/boot/x86/desktop/amdagdt.cfg
delete mode 100644 build/boot/x86/desktop/amdatdt.cfg
delete mode 100644 build/boot/x86/desktop/amdgtkdt.cfg
diff --git a/build/boot/x86/386adgtk.cfg b/build/boot/x86/386adgtk.cfg
new file mode 100644
index 0000000..a81dd3d
--- /dev/null
+++ b/build/boot/x86/386adgtk.cfg
@@ -0,0 +1,12 @@
+menu hshift 9
+menu width 58
+
+label expertgui
+ menu label Graphical expert install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- ${CONSOLE}
+include ${SYSDIR}386rqgtk.cfg
+label autogui
+ menu label Graphical automated install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386adtxt.cfg b/build/boot/x86/386adtxt.cfg
new file mode 100644
index 0000000..388e17b
--- /dev/null
+++ b/build/boot/x86/386adtxt.cfg
@@ -0,0 +1,9 @@
+label expert
+ menu label ^Expert install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${386_INITRD} -- ${CONSOLE}
+include ${SYSDIR}386rqtxt.cfg
+label auto
+ menu label ^Automated install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${386_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386gtk.cfg b/build/boot/x86/386gtk.cfg
new file mode 100644
index 0000000..0c7c5a6
--- /dev/null
+++ b/build/boot/x86/386gtk.cfg
@@ -0,0 +1,4 @@
+label installgui
+ menu label ^Graphical install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386rqgtk.cfg b/build/boot/x86/386rqgtk.cfg
new file mode 100644
index 0000000..07a0800
--- /dev/null
+++ b/build/boot/x86/386rqgtk.cfg
@@ -0,0 +1,4 @@
+label rescuegui
+ menu label Graphical rescue mode
+ kernel ${386_KERNEL}
+ append ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386rqtxt.cfg b/build/boot/x86/386rqtxt.cfg
new file mode 100644
index 0000000..0574b08
--- /dev/null
+++ b/build/boot/x86/386rqtxt.cfg
@@ -0,0 +1,4 @@
+label rescue
+ menu label ^Rescue mode
+ kernel ${386_KERNEL}
+ append ${VIDEO_MODE} initrd=${386_INITRD} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386spgtk.cfg b/build/boot/x86/386spgtk.cfg
new file mode 100644
index 0000000..7aef17f
--- /dev/null
+++ b/build/boot/x86/386spgtk.cfg
@@ -0,0 +1,4 @@
+label installspk
+ menu label Install with ^speech synthesis
+ kernel ${386_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386spk.cfg b/build/boot/x86/386spk.cfg
new file mode 100644
index 0000000..e04091e
--- /dev/null
+++ b/build/boot/x86/386spk.cfg
@@ -0,0 +1,4 @@
+label installspk
+ menu label Install with ^speech synthesis
+ kernel ${386_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386txt.cfg b/build/boot/x86/386txt.cfg
new file mode 100644
index 0000000..596bf88
--- /dev/null
+++ b/build/boot/x86/386txt.cfg
@@ -0,0 +1,6 @@
+default install
+label install
+ menu label ^Install
+ menu default
+ kernel ${386_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/adgtk.cfg b/build/boot/x86/adgtk.cfg
index 26ad24b..9b59dc7 100644
--- a/build/boot/x86/adgtk.cfg
+++ b/build/boot/x86/adgtk.cfg
@@ -1,12 +1,9 @@
-menu hshift 9
-menu width 58
-
-label expertgui
- menu label Graphical expert install
- kernel ${KERNEL}
+label amd64-expertgui
+ menu label 64 bit graphical expert install
+ kernel ${AMD_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE}
include ${SYSDIR}rqgtk.cfg
-label autogui
- menu label Graphical automated install
- kernel ${KERNEL}
+label amd64-autogui
+ menu label 64 bit graphical automated install
+ kernel ${AMD_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/adtxt.cfg b/build/boot/x86/adtxt.cfg
index 268d456..64915f0 100644
--- a/build/boot/x86/adtxt.cfg
+++ b/build/boot/x86/adtxt.cfg
@@ -1,9 +1,12 @@
-label expert
- menu label ^Expert install
- kernel ${KERNEL}
+menu hshift 9
+menu width 58
+
+label amd64-expert
+ menu label 64 bit expert install
+ kernel ${AMD_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
include ${SYSDIR}rqtxt.cfg
-label auto
- menu label ^Automated install
- kernel ${KERNEL}
+label amd64-auto
+ menu label 64 bit automated install
+ kernel ${AMD_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/amdadgtk.cfg b/build/boot/x86/amdadgtk.cfg
deleted file mode 100644
index 310a159..0000000
--- a/build/boot/x86/amdadgtk.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-label amd64-expertgui
- menu label 64 bit graphical expert install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- ${CONSOLE}
-include ${SYSDIR}amdrqgtk.cfg
-label amd64-autogui
- menu label 64 bit graphical automated install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/amdadtxt.cfg b/build/boot/x86/amdadtxt.cfg
deleted file mode 100644
index f3863a6..0000000
--- a/build/boot/x86/amdadtxt.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-menu hshift 9
-menu width 58
-
-label amd64-expert
- menu label 64 bit expert install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${AMD_INITRD} -- ${CONSOLE}
-include ${SYSDIR}amdrqtxt.cfg
-label amd64-auto
- menu label 64 bit automated install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/amdgtk.cfg b/build/boot/x86/amdgtk.cfg
deleted file mode 100644
index 6704a0b..0000000
--- a/build/boot/x86/amdgtk.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-label amd64-installgui
- menu label 64 bit graphical install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/amdrqgtk.cfg b/build/boot/x86/amdrqgtk.cfg
deleted file mode 100644
index 20efff4..0000000
--- a/build/boot/x86/amdrqgtk.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-label amd64-rescuegui
- menu label 64 bit graphical rescue mode
- kernel ${AMD_KERNEL}
- append ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/amdrqtxt.cfg b/build/boot/x86/amdrqtxt.cfg
deleted file mode 100644
index ea640d4..0000000
--- a/build/boot/x86/amdrqtxt.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-label amd64-rescue
- menu label 64 bit rescue mode
- kernel ${AMD_KERNEL}
- append ${VIDEO_MODE} initrd=${AMD_INITRD} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/amdspgtk.cfg b/build/boot/x86/amdspgtk.cfg
deleted file mode 100644
index 625f7a6..0000000
--- a/build/boot/x86/amdspgtk.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-label amd64-installspk
- menu label 64 bit speech install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/amdspk.cfg b/build/boot/x86/amdspk.cfg
deleted file mode 100644
index f83cdf7..0000000
--- a/build/boot/x86/amdspk.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-label amd64-installspk
- menu label 64 bit speech install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/amdtxt.cfg b/build/boot/x86/amdtxt.cfg
deleted file mode 100644
index e347679..0000000
--- a/build/boot/x86/amdtxt.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-default64 amd64-install
-label amd64-install
- menu label ^64 bit install
- menu default64
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/386agdt.cfg b/build/boot/x86/desktop/386agdt.cfg
new file mode 100644
index 0000000..9537645
--- /dev/null
+++ b/build/boot/x86/desktop/386agdt.cfg
@@ -0,0 +1,11 @@
+menu hshift 9
+menu width 58
+
+label expertgui-%desktop%
+ menu label Graphical expert install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- ${CONSOLE}
+label autogui-%desktop%
+ menu label Graphical automated install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/386atdt.cfg b/build/boot/x86/desktop/386atdt.cfg
new file mode 100644
index 0000000..3aa838f
--- /dev/null
+++ b/build/boot/x86/desktop/386atdt.cfg
@@ -0,0 +1,8 @@
+label expert-%desktop%
+ menu label ^Expert install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${386_INITRD} -- ${CONSOLE}
+label auto-%desktop%
+ menu label ^Automated install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${386_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/386gtkdt.cfg b/build/boot/x86/desktop/386gtkdt.cfg
new file mode 100644
index 0000000..134cc2d
--- /dev/null
+++ b/build/boot/x86/desktop/386gtkdt.cfg
@@ -0,0 +1,4 @@
+label installgui-%desktop%
+ menu label ^Graphical install
+ kernel ${386_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/adgtkdt.cfg b/build/boot/x86/desktop/adgtkdt.cfg
index 41e4ad8..d5cac3b 100644
--- a/build/boot/x86/desktop/adgtkdt.cfg
+++ b/build/boot/x86/desktop/adgtkdt.cfg
@@ -1,11 +1,8 @@
-menu hshift 9
-menu width 58
-
-label expertgui-%desktop%
- menu label Graphical expert install
+label amd64-expertgui-%desktop%
+ menu label 64 bit graphical expert install
kernel ${KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE}
-label autogui-%desktop%
- menu label Graphical automated install
+label amd64-autogui-%desktop%
+ menu label 64 bit graphical automated install
kernel ${KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/adtxtdt.cfg b/build/boot/x86/desktop/adtxtdt.cfg
index f10272d..69c5b50 100644
--- a/build/boot/x86/desktop/adtxtdt.cfg
+++ b/build/boot/x86/desktop/adtxtdt.cfg
@@ -1,8 +1,11 @@
-label expert-%desktop%
- menu label ^Expert install
+menu hshift 9
+menu width 58
+
+label amd64-expert-%desktop%
+ menu label 64 bit expert install
kernel ${KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
-label auto-%desktop%
- menu label ^Automated install
+label amd64-auto-%desktop%
+ menu label 64 bit automated install
kernel ${KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amdagdt.cfg b/build/boot/x86/desktop/amdagdt.cfg
deleted file mode 100644
index 784a117..0000000
--- a/build/boot/x86/desktop/amdagdt.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-label amd64-expertgui-%desktop%
- menu label 64 bit graphical expert install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- ${CONSOLE}
-label amd64-autogui-%desktop%
- menu label 64 bit graphical automated install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amdatdt.cfg b/build/boot/x86/desktop/amdatdt.cfg
deleted file mode 100644
index 838483a..0000000
--- a/build/boot/x86/desktop/amdatdt.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-menu hshift 9
-menu width 58
-
-label amd64-expert-%desktop%
- menu label 64 bit expert install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${AMD_INITRD} -- ${CONSOLE}
-label amd64-auto-%desktop%
- menu label 64 bit automated install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amdgtkdt.cfg b/build/boot/x86/desktop/amdgtkdt.cfg
deleted file mode 100644
index 46c2f1f..0000000
--- a/build/boot/x86/desktop/amdgtkdt.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-label amd64-installgui-%desktop%
- menu label 64 bit graphical install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amdspkdt.cfg b/build/boot/x86/desktop/amdspkdt.cfg
index a2be5de..0693ff6 100644
--- a/build/boot/x86/desktop/amdspkdt.cfg
+++ b/build/boot/x86/desktop/amdspkdt.cfg
@@ -1,4 +1,4 @@
label amd64-installspk-%desktop%
menu label 64 bit speech install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD} speakup.synth=soft -- quiet ${CONSOLE}
+ kernel ${KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amdtxtdt.cfg b/build/boot/x86/desktop/amdtxtdt.cfg
index be4a3e9..9008e17 100644
--- a/build/boot/x86/desktop/amdtxtdt.cfg
+++ b/build/boot/x86/desktop/amdtxtdt.cfg
@@ -2,5 +2,5 @@
label amd64-install-%desktop%
menu label ^64 bit install
menu default64
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
+ kernel ${KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amspgtdt.cfg b/build/boot/x86/desktop/amspgtdt.cfg
index 04b048f..5dd674e 100644
--- a/build/boot/x86/desktop/amspgtdt.cfg
+++ b/build/boot/x86/desktop/amspgtdt.cfg
@@ -1,4 +1,4 @@
label amd64-installspk-%desktop%
menu label 64 bit speech install
- kernel ${AMD_KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
+ kernel ${KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/gtkdt.cfg b/build/boot/x86/desktop/gtkdt.cfg
index 282ba03..3518a07 100644
--- a/build/boot/x86/desktop/gtkdt.cfg
+++ b/build/boot/x86/desktop/gtkdt.cfg
@@ -1,4 +1,4 @@
-label installgui-%desktop%
- menu label ^Graphical install
+label amd64-installgui-%desktop%
+ menu label 64 bit graphical install
kernel ${KERNEL}
append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/spkdt.cfg b/build/boot/x86/desktop/spkdt.cfg
index c6e6fa8..f7b65ad 100644
--- a/build/boot/x86/desktop/spkdt.cfg
+++ b/build/boot/x86/desktop/spkdt.cfg
@@ -1,4 +1,4 @@
label installspk-%desktop%
menu label Install with ^speech synthesis
- kernel ${KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} speakup.synth=soft -- quiet ${CONSOLE}
+ kernel ${386_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/spkgtkdt.cfg b/build/boot/x86/desktop/spkgtkdt.cfg
index c730a62..e16fd10 100644
--- a/build/boot/x86/desktop/spkgtkdt.cfg
+++ b/build/boot/x86/desktop/spkgtkdt.cfg
@@ -1,4 +1,4 @@
label installspk-%desktop%
menu label Install with ^speech synthesis
- kernel ${KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
+ kernel ${386_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/txtdt.cfg b/build/boot/x86/desktop/txtdt.cfg
index 7ef5b82..f317962 100644
--- a/build/boot/x86/desktop/txtdt.cfg
+++ b/build/boot/x86/desktop/txtdt.cfg
@@ -2,5 +2,5 @@
label install-%desktop%
menu label ^Install
menu default
- kernel ${KERNEL}
- append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
+ kernel ${386_KERNEL}
+ append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/gtk.cfg b/build/boot/x86/gtk.cfg
index 3cfb88f..760846f 100644
--- a/build/boot/x86/gtk.cfg
+++ b/build/boot/x86/gtk.cfg
@@ -1,4 +1,4 @@
-label installgui
- menu label ^Graphical install
- kernel ${KERNEL}
+label amd64-installgui
+ menu label 64 bit graphical install
+ kernel ${AMD_KERNEL}
append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/menu.cfg b/build/boot/x86/menu.cfg
index 7b1c762..9ab237b 100644
--- a/build/boot/x86/menu.cfg
+++ b/build/boot/x86/menu.cfg
@@ -3,10 +3,10 @@ menu width 61
menu title ${BEEP}Debian GNU/Linux installer boot menu
include ${SYSDIR}stdmenu.cfg
+include ${SYSDIR}386txt.cfg
include ${SYSDIR}txt.cfg
-include ${SYSDIR}amdtxt.cfg
+include ${SYSDIR}386gtk.cfg
include ${SYSDIR}gtk.cfg
-include ${SYSDIR}amdgtk.cfg
menu begin advanced
menu label ^Advanced options
menu title Advanced options
@@ -14,10 +14,10 @@ menu begin advanced
label mainmenu
menu label ^Back..
menu exit
+ include ${SYSDIR}386adtxt.cfg
include ${SYSDIR}adtxt.cfg
- include ${SYSDIR}amdadtxt.cfg
+ include ${SYSDIR}386adgtk.cfg
include ${SYSDIR}adgtk.cfg
- include ${SYSDIR}amdadgtk.cfg
include ${SYSDIR}dtmenu.cfg
menu end
label help
@@ -26,7 +26,7 @@ label help
Display help screens; type 'menu' at boot prompt to return to this menu
endtext
config ${SYSDIR}prompt.cfg
+include ${SYSDIR}386spk.cfg
include ${SYSDIR}spk.cfg
-include ${SYSDIR}amdspk.cfg
+include ${SYSDIR}386spgtk.cfg
include ${SYSDIR}spkgtk.cfg
-include ${SYSDIR}amdspgtk.cfg
diff --git a/build/boot/x86/rqgtk.cfg b/build/boot/x86/rqgtk.cfg
index 8a88e32..7491d39 100644
--- a/build/boot/x86/rqgtk.cfg
+++ b/build/boot/x86/rqgtk.cfg
@@ -1,4 +1,4 @@
-label rescuegui
- menu label Graphical rescue mode
- kernel ${KERNEL}
+label amd64-rescuegui
+ menu label 64 bit graphical rescue mode
+ kernel ${AMD_KERNEL}
append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/rqtxt.cfg b/build/boot/x86/rqtxt.cfg
index a511c35..3148ff9 100644
--- a/build/boot/x86/rqtxt.cfg
+++ b/build/boot/x86/rqtxt.cfg
@@ -1,4 +1,4 @@
-label rescue
- menu label ^Rescue mode
- kernel ${KERNEL}
+label amd64-rescue
+ menu label 64 bit rescue mode
+ kernel ${AMD_KERNEL}
append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/spk.cfg b/build/boot/x86/spk.cfg
index 270a415..ff330f9 100644
--- a/build/boot/x86/spk.cfg
+++ b/build/boot/x86/spk.cfg
@@ -1,4 +1,4 @@
-label installspk
- menu label Install with ^speech synthesis
- kernel ${KERNEL}
+label amd64-installspk
+ menu label 64 bit speech install
+ kernel ${AMD_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/spkgtk.cfg b/build/boot/x86/spkgtk.cfg
index 8212aec..bf860d4 100644
--- a/build/boot/x86/spkgtk.cfg
+++ b/build/boot/x86/spkgtk.cfg
@@ -1,4 +1,4 @@
-label installspk
- menu label Install with ^speech synthesis
- kernel ${KERNEL}
+label amd64-installspk
+ menu label 64 bit speech install
+ kernel ${AMD_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/txt.cfg b/build/boot/x86/txt.cfg
index d15af36..08d30bd 100644
--- a/build/boot/x86/txt.cfg
+++ b/build/boot/x86/txt.cfg
@@ -1,6 +1,6 @@
-default install
-label install
- menu label ^Install
- menu default
- kernel ${KERNEL}
+default64 amd64-install
+label amd64-install
+ menu label ^64 bit install
+ menu default64
+ kernel ${AMD_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff --git a/build/config/x86.cfg b/build/config/x86.cfg
index 456314f..c054e42 100644
--- a/build/config/x86.cfg
+++ b/build/config/x86.cfg
@@ -199,9 +199,9 @@ arch_cd_info_dir: x86_syslinux x86_grub_efi
KERNEL /%install%/vmlinuz \
INITRD /%install%/initrd.gz \
INITRD_GTK /%install%/gtk/initrd.gz \
- AMD_KERNEL /%install-amd%/vmlinuz \
- AMD_INITRD /%install-amd%/initrd.gz \
- AMD_INITRD_GTK /%install-amd%/gtk/initrd.gz \
+ 386_KERNEL /%install-amd%/vmlinuz \
+ 386_INITRD /%install-amd%/initrd.gz \
+ 386_INITRD_GTK /%install-amd%/gtk/initrd.gz \
VIDEO_MODE $(VIDEO_MODE) \
VIDEO_MODE_GTK $(VIDEO_MODE_GTK) \
BEEP "$$beep" \
--
2.1.0
>From 6f2182bfdbbb5a66cf9b3c50b32972bcf48b006f Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Fri, 29 Aug 2014 21:22:09 -0400
Subject: [PATCH 2/2] Swap 32 and 64 bits label texts
The rationale for this fix is that installing an i386 should be the exception
rather than the norm these days. Also, 32 bits install on an 64 bits work fine
while the inverse fails very early. We should therefore warn users early.
---
build/boot/x86/386adgtk.cfg | 4 ++--
build/boot/x86/386adtxt.cfg | 4 ++--
build/boot/x86/386gtk.cfg | 2 +-
build/boot/x86/386rqgtk.cfg | 2 +-
build/boot/x86/386rqtxt.cfg | 2 +-
build/boot/x86/386spgtk.cfg | 2 +-
build/boot/x86/386spk.cfg | 2 +-
build/boot/x86/386txt.cfg | 2 +-
build/boot/x86/adgtk.cfg | 4 ++--
build/boot/x86/adtxt.cfg | 4 ++--
build/boot/x86/desktop/386agdt.cfg | 4 ++--
build/boot/x86/desktop/386atdt.cfg | 4 ++--
build/boot/x86/desktop/386gtkdt.cfg | 2 +-
build/boot/x86/desktop/adgtkdt.cfg | 4 ++--
build/boot/x86/desktop/adtxtdt.cfg | 4 ++--
build/boot/x86/desktop/amdspkdt.cfg | 2 +-
build/boot/x86/desktop/amdtxtdt.cfg | 2 +-
build/boot/x86/desktop/amspgtdt.cfg | 2 +-
build/boot/x86/desktop/gtkdt.cfg | 2 +-
build/boot/x86/desktop/spkdt.cfg | 2 +-
build/boot/x86/desktop/spkgtkdt.cfg | 2 +-
build/boot/x86/desktop/txtdt.cfg | 2 +-
build/boot/x86/gtk.cfg | 2 +-
build/boot/x86/rqgtk.cfg | 2 +-
build/boot/x86/rqtxt.cfg | 2 +-
build/boot/x86/spk.cfg | 2 +-
build/boot/x86/spkgtk.cfg | 2 +-
build/boot/x86/txt.cfg | 2 +-
28 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/build/boot/x86/386adgtk.cfg b/build/boot/x86/386adgtk.cfg
index a81dd3d..715c6aa 100644
--- a/build/boot/x86/386adgtk.cfg
+++ b/build/boot/x86/386adgtk.cfg
@@ -2,11 +2,11 @@ menu hshift 9
menu width 58
label expertgui
- menu label Graphical expert install
+ menu label 32 bit graphical expert install
kernel ${386_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- ${CONSOLE}
include ${SYSDIR}386rqgtk.cfg
label autogui
- menu label Graphical automated install
+ menu label 32 bit graphical automated install
kernel ${386_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386adtxt.cfg b/build/boot/x86/386adtxt.cfg
index 388e17b..fcf05ce 100644
--- a/build/boot/x86/386adtxt.cfg
+++ b/build/boot/x86/386adtxt.cfg
@@ -1,9 +1,9 @@
label expert
- menu label ^Expert install
+ menu label ^32 bit expert install
kernel ${386_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${386_INITRD} -- ${CONSOLE}
include ${SYSDIR}386rqtxt.cfg
label auto
- menu label ^Automated install
+ menu label ^32 bit automated install
kernel ${386_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${386_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386gtk.cfg b/build/boot/x86/386gtk.cfg
index 0c7c5a6..0c5e10d 100644
--- a/build/boot/x86/386gtk.cfg
+++ b/build/boot/x86/386gtk.cfg
@@ -1,4 +1,4 @@
label installgui
- menu label ^Graphical install
+ menu label ^32 bit graphical install
kernel ${386_KERNEL}
append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386rqgtk.cfg b/build/boot/x86/386rqgtk.cfg
index 07a0800..b49566a 100644
--- a/build/boot/x86/386rqgtk.cfg
+++ b/build/boot/x86/386rqgtk.cfg
@@ -1,4 +1,4 @@
label rescuegui
- menu label Graphical rescue mode
+ menu label 32 bit graphical rescue mode
kernel ${386_KERNEL}
append ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386rqtxt.cfg b/build/boot/x86/386rqtxt.cfg
index 0574b08..b7b7559 100644
--- a/build/boot/x86/386rqtxt.cfg
+++ b/build/boot/x86/386rqtxt.cfg
@@ -1,4 +1,4 @@
label rescue
- menu label ^Rescue mode
+ menu label ^32 bit rescue mode
kernel ${386_KERNEL}
append ${VIDEO_MODE} initrd=${386_INITRD} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386spgtk.cfg b/build/boot/x86/386spgtk.cfg
index 7aef17f..3af6c9c 100644
--- a/build/boot/x86/386spgtk.cfg
+++ b/build/boot/x86/386spgtk.cfg
@@ -1,4 +1,4 @@
label installspk
- menu label Install with ^speech synthesis
+ menu label 32 bit install with ^speech synthesis
kernel ${386_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386spk.cfg b/build/boot/x86/386spk.cfg
index e04091e..790b35a 100644
--- a/build/boot/x86/386spk.cfg
+++ b/build/boot/x86/386spk.cfg
@@ -1,4 +1,4 @@
label installspk
- menu label Install with ^speech synthesis
+ menu label 32 bit install with ^speech synthesis
kernel ${386_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/386txt.cfg b/build/boot/x86/386txt.cfg
index 596bf88..cbe0436 100644
--- a/build/boot/x86/386txt.cfg
+++ b/build/boot/x86/386txt.cfg
@@ -1,6 +1,6 @@
default install
label install
- menu label ^Install
+ menu label ^32 bit install
menu default
kernel ${386_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/adgtk.cfg b/build/boot/x86/adgtk.cfg
index 9b59dc7..95ee6f3 100644
--- a/build/boot/x86/adgtk.cfg
+++ b/build/boot/x86/adgtk.cfg
@@ -1,9 +1,9 @@
label amd64-expertgui
- menu label 64 bit graphical expert install
+ menu label Graphical expert install
kernel ${AMD_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE}
include ${SYSDIR}rqgtk.cfg
label amd64-autogui
- menu label 64 bit graphical automated install
+ menu label Graphical automated install
kernel ${AMD_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/adtxt.cfg b/build/boot/x86/adtxt.cfg
index 64915f0..5e16a6e 100644
--- a/build/boot/x86/adtxt.cfg
+++ b/build/boot/x86/adtxt.cfg
@@ -2,11 +2,11 @@ menu hshift 9
menu width 58
label amd64-expert
- menu label 64 bit expert install
+ menu label Expert install
kernel ${AMD_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
include ${SYSDIR}rqtxt.cfg
label amd64-auto
- menu label 64 bit automated install
+ menu label Automated install
kernel ${AMD_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/386agdt.cfg b/build/boot/x86/desktop/386agdt.cfg
index 9537645..7f0e339 100644
--- a/build/boot/x86/desktop/386agdt.cfg
+++ b/build/boot/x86/desktop/386agdt.cfg
@@ -2,10 +2,10 @@ menu hshift 9
menu width 58
label expertgui-%desktop%
- menu label Graphical expert install
+ menu label 32 bit graphical expert install
kernel ${386_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- ${CONSOLE}
label autogui-%desktop%
- menu label Graphical automated install
+ menu label 32 bit graphical automated install
kernel ${386_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/386atdt.cfg b/build/boot/x86/desktop/386atdt.cfg
index 3aa838f..88c0e99 100644
--- a/build/boot/x86/desktop/386atdt.cfg
+++ b/build/boot/x86/desktop/386atdt.cfg
@@ -1,8 +1,8 @@
label expert-%desktop%
- menu label ^Expert install
+ menu label ^32 bit expert install
kernel ${386_KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${386_INITRD} -- ${CONSOLE}
label auto-%desktop%
- menu label ^Automated install
+ menu label ^32 bit automated install
kernel ${386_KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${386_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/386gtkdt.cfg b/build/boot/x86/desktop/386gtkdt.cfg
index 134cc2d..7282f47 100644
--- a/build/boot/x86/desktop/386gtkdt.cfg
+++ b/build/boot/x86/desktop/386gtkdt.cfg
@@ -1,4 +1,4 @@
label installgui-%desktop%
- menu label ^Graphical install
+ menu label ^32 bit graphical install
kernel ${386_KERNEL}
append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${386_INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/adgtkdt.cfg b/build/boot/x86/desktop/adgtkdt.cfg
index d5cac3b..8f6bca6 100644
--- a/build/boot/x86/desktop/adgtkdt.cfg
+++ b/build/boot/x86/desktop/adgtkdt.cfg
@@ -1,8 +1,8 @@
label amd64-expertgui-%desktop%
- menu label 64 bit graphical expert install
+ menu label Graphical expert install
kernel ${KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE}
label amd64-autogui-%desktop%
- menu label 64 bit graphical automated install
+ menu label Graphical automated install
kernel ${KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/adtxtdt.cfg b/build/boot/x86/desktop/adtxtdt.cfg
index 69c5b50..336b7dc 100644
--- a/build/boot/x86/desktop/adtxtdt.cfg
+++ b/build/boot/x86/desktop/adtxtdt.cfg
@@ -2,10 +2,10 @@ menu hshift 9
menu width 58
label amd64-expert-%desktop%
- menu label 64 bit expert install
+ menu label Expert install
kernel ${KERNEL}
append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
label amd64-auto-%desktop%
- menu label 64 bit automated install
+ menu label Automated install
kernel ${KERNEL}
append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amdspkdt.cfg b/build/boot/x86/desktop/amdspkdt.cfg
index 0693ff6..179d77c 100644
--- a/build/boot/x86/desktop/amdspkdt.cfg
+++ b/build/boot/x86/desktop/amdspkdt.cfg
@@ -1,4 +1,4 @@
label amd64-installspk-%desktop%
- menu label 64 bit speech install
+ menu label Speech install
kernel ${KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amdtxtdt.cfg b/build/boot/x86/desktop/amdtxtdt.cfg
index 9008e17..4197d0a 100644
--- a/build/boot/x86/desktop/amdtxtdt.cfg
+++ b/build/boot/x86/desktop/amdtxtdt.cfg
@@ -1,6 +1,6 @@
#default64 amd64-install
label amd64-install-%desktop%
- menu label ^64 bit install
+ menu label ^Install
menu default64
kernel ${KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/amspgtdt.cfg b/build/boot/x86/desktop/amspgtdt.cfg
index 5dd674e..2347389 100644
--- a/build/boot/x86/desktop/amspgtdt.cfg
+++ b/build/boot/x86/desktop/amspgtdt.cfg
@@ -1,4 +1,4 @@
label amd64-installspk-%desktop%
- menu label 64 bit speech install
+ menu label Speech install
kernel ${KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/gtkdt.cfg b/build/boot/x86/desktop/gtkdt.cfg
index 3518a07..b8fc17e 100644
--- a/build/boot/x86/desktop/gtkdt.cfg
+++ b/build/boot/x86/desktop/gtkdt.cfg
@@ -1,4 +1,4 @@
label amd64-installgui-%desktop%
- menu label 64 bit graphical install
+ menu label Graphical install
kernel ${KERNEL}
append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/spkdt.cfg b/build/boot/x86/desktop/spkdt.cfg
index f7b65ad..805ff3f 100644
--- a/build/boot/x86/desktop/spkdt.cfg
+++ b/build/boot/x86/desktop/spkdt.cfg
@@ -1,4 +1,4 @@
label installspk-%desktop%
- menu label Install with ^speech synthesis
+ menu label 32 bit install with ^speech synthesis
kernel ${386_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/spkgtkdt.cfg b/build/boot/x86/desktop/spkgtkdt.cfg
index e16fd10..635c2b2 100644
--- a/build/boot/x86/desktop/spkgtkdt.cfg
+++ b/build/boot/x86/desktop/spkgtkdt.cfg
@@ -1,4 +1,4 @@
label installspk-%desktop%
- menu label Install with ^speech synthesis
+ menu label 32 bit install with ^speech synthesis
kernel ${386_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/desktop/txtdt.cfg b/build/boot/x86/desktop/txtdt.cfg
index f317962..a96fc4e 100644
--- a/build/boot/x86/desktop/txtdt.cfg
+++ b/build/boot/x86/desktop/txtdt.cfg
@@ -1,6 +1,6 @@
#default install
label install-%desktop%
- menu label ^Install
+ menu label ^32 bit install
menu default
kernel ${386_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${386_INITRD} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/gtk.cfg b/build/boot/x86/gtk.cfg
index 760846f..2a908e0 100644
--- a/build/boot/x86/gtk.cfg
+++ b/build/boot/x86/gtk.cfg
@@ -1,4 +1,4 @@
label amd64-installgui
- menu label 64 bit graphical install
+ menu label Graphical install
kernel ${AMD_KERNEL}
append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/build/boot/x86/rqgtk.cfg b/build/boot/x86/rqgtk.cfg
index 7491d39..c864393 100644
--- a/build/boot/x86/rqgtk.cfg
+++ b/build/boot/x86/rqgtk.cfg
@@ -1,4 +1,4 @@
label amd64-rescuegui
- menu label 64 bit graphical rescue mode
+ menu label Graphical rescue mode
kernel ${AMD_KERNEL}
append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/rqtxt.cfg b/build/boot/x86/rqtxt.cfg
index 3148ff9..6d75941 100644
--- a/build/boot/x86/rqtxt.cfg
+++ b/build/boot/x86/rqtxt.cfg
@@ -1,4 +1,4 @@
label amd64-rescue
- menu label 64 bit rescue mode
+ menu label Rescue mode
kernel ${AMD_KERNEL}
append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE}
diff --git a/build/boot/x86/spk.cfg b/build/boot/x86/spk.cfg
index ff330f9..3fd71a2 100644
--- a/build/boot/x86/spk.cfg
+++ b/build/boot/x86/spk.cfg
@@ -1,4 +1,4 @@
label amd64-installspk
- menu label 64 bit speech install
+ menu label Speech install
kernel ${AMD_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/spkgtk.cfg b/build/boot/x86/spkgtk.cfg
index bf860d4..360edac 100644
--- a/build/boot/x86/spkgtk.cfg
+++ b/build/boot/x86/spkgtk.cfg
@@ -1,4 +1,4 @@
label amd64-installspk
- menu label 64 bit speech install
+ menu label Speech install
kernel ${AMD_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD_GTK} speakup.synth=soft -- quiet ${CONSOLE}
diff --git a/build/boot/x86/txt.cfg b/build/boot/x86/txt.cfg
index 08d30bd..79b6f65 100644
--- a/build/boot/x86/txt.cfg
+++ b/build/boot/x86/txt.cfg
@@ -1,6 +1,6 @@
default64 amd64-install
label amd64-install
- menu label ^64 bit install
+ menu label ^Install
menu default64
kernel ${AMD_KERNEL}
append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
--
2.1.0
