On Tuesday 16 September 2008, Frans Pop wrote: > On Wednesday 10 September 2008, Frans Pop wrote: > > We could combine that with making the graphical installer the default > > version of the installer for Lenny (i.e: the top choice in cases > > where both are available). I think all issues that blocked that > > switch have been solved now. > > As both Jérémy and Otavio responded positively to this idea and nobody > spoke against it, I will prepare the patches to do this. If anybody > disagrees with this change, this is your last chance to speak up!
Attached a proposed patch to do this. This patch is the simplest solution I can come up with. It leaves the order of the syslinux menu and the installation options unchanged; *only* the default option is changed if both the regular and graphical installer initrds are present. This means that users will get the graphical installer if they "blindly" hit <enter>, but that they will still need to type 'installgui' after viewing the help screens and that 'install' will still run the "regular" installer. It also means that users will need to consciously select the graphical installer if they, for example, go to the advanced menu. The patch is on top of a rename of two syslinux config files I did in commit r55980 (debian-cd was updated to deal with that rename). How the patch works is that instead of adding the "gtk" config files to the "text" config files [1] if both initrds are present, we include either the one or the other. This is a bit less modular, but I've checked that the result is correct for all images. No additional changes in debian-cd are needed to support this change. Comments welcome. Cheers, FJP [1] Note that "text" and "gtk" are not really good names for the config files as their real meaning is "only one initrd available" (which can be either the regular or the graphical one) versus "both regular and graphical initrd available". For example, the graphical mini.iso has (and always has had) only the "text" config files.
commit 347ed49c968a26500e28a96478e2a49cf187019c
Author: Frans Pop <[EMAIL PROTECTED]>
Date: Sun Sep 21 23:39:15 2008 +0200
Make the graphical installer the default installation option
The syslinux menu itself is not changed, only the default option
changes from "Install" to "Graphical install".
diff --git a/installer/build/boot/x86/adamdgtk.cfg b/installer/build/boot/x86/adamdgtk.cfg
index 8139279..1bc9ae4 100644
--- a/installer/build/boot/x86/adamdgtk.cfg
+++ b/installer/build/boot/x86/adamdgtk.cfg
@@ -1,3 +1,15 @@
+label amd64-expert
+ menu label 64 bit expert install
+ kernel ${KERNEL}
+ append priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
+label amd64-rescue
+ menu label 64 bit rescue mode
+ kernel ${KERNEL}
+ append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE}
+label amd64-auto
+ menu label 64 bit automated install
+ kernel ${KERNEL}
+ append auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
label amd64-expertgui
menu label 64 bit graphical expert install
kernel ${KERNEL}
diff --git a/installer/build/boot/x86/adgtk.cfg b/installer/build/boot/x86/adgtk.cfg
index 47bdc69..6a22ca9 100644
--- a/installer/build/boot/x86/adgtk.cfg
+++ b/installer/build/boot/x86/adgtk.cfg
@@ -1,6 +1,18 @@
menu hshift 9
menu width 58
+label expert
+ menu label ^Expert install
+ kernel ${KERNEL}
+ append priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
+label rescue
+ menu label ^Rescue mode
+ kernel ${KERNEL}
+ append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE}
+label auto
+ menu label ^Automated install
+ kernel ${KERNEL}
+ append auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
label expertgui
menu label Graphical expert install
kernel ${KERNEL}
diff --git a/installer/build/boot/x86/amdgtk.cfg b/installer/build/boot/x86/amdgtk.cfg
index c30fd58..c0f9a6f 100644
--- a/installer/build/boot/x86/amdgtk.cfg
+++ b/installer/build/boot/x86/amdgtk.cfg
@@ -1,4 +1,9 @@
+label amd64-install
+ menu label ^64 bit install
+ kernel ${KERNEL}
+ append ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
label amd64-installgui
menu label 64 bit graphical install
+ menu default64
kernel ${KERNEL}
append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/installer/build/boot/x86/gtk.cfg b/installer/build/boot/x86/gtk.cfg
index a4b2977..5605060 100644
--- a/installer/build/boot/x86/gtk.cfg
+++ b/installer/build/boot/x86/gtk.cfg
@@ -1,4 +1,9 @@
+label install
+ menu label ^Install
+ kernel ${KERNEL}
+ append ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
label installgui
menu label ^Graphical install
+ menu default
kernel ${KERNEL}
append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
diff --git a/installer/build/util/syslinux-cfgs b/installer/build/util/syslinux-cfgs
index 2508154..d82631f 100755
--- a/installer/build/util/syslinux-cfgs
+++ b/installer/build/util/syslinux-cfgs
@@ -6,7 +6,7 @@ INCLUDE_AMD="$2"
filter_gtk () {
if [ -n "$INCLUDE_GTK" ]; then
- cat
+ grep -v text
else
grep -v gtk
fi
signature.asc
Description: This is a digitally signed message part.
