On Monday 22 September 2008, Frans Pop wrote: > 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. Attached a patch for an alternative, more invasive solution. This patch applies *on top of* the patch in my previous mail! This patch _does_ change the order and names of the menu options, but without requiring changes in the build system (configs and pkg-lists). Advantage is that selection of the graphical installer becomes much more natural because it now becomes the first listed and default option. Main disadvantage is that it really breaks with previous releases and users may have to get used to the new names. Issues: - I've chosen not to add extra options for 'installgui' for backwards compatibility. With the new menu system the need for backwards compatibility is a lot less than it was when you had to actually type the option you wanted in most cases. - I'm not really happy with 'installtxt', 'experttxt', etc.; especially the double t in the last is awkward. Alternatives as 'installnewt' or 'installclassic' have their own problems. Suggestions/opinions? - I'm also not completely happy with "text-based" as description of the "regular" installer, but cannot come up with anything better. The patch is untested, but should be OK. No changes in debian-cd should be required. This patch will probably require some changes in the installation guide. I'm not sure if we should do this now or postpone it until we do a more extensive reorganization [1] of the build system for squeeze. Again comments welcome. Cheers, FJP [1] For me that reorganization would mean actually building the graphical installer as the normal image and changing the newt-only images to a kind of specialized lowmem variant. Text-based installs would then be selected by adding "DEBIAN_FRONTEND=newt" instead of selecting a different initrd.
commit 265f2ddf26c24b10a5347bc1c6061799e05ed712 Author: Frans Pop <fjp@debian.org> Date: Mon Sep 22 02:06:31 2008 +0200 Make the graphical installer the default installation option - alternative diff --git a/installer/build/boot/x86/adamdgtk.cfg b/installer/build/boot/x86/adamdgtk.cfg index 1bc9ae4..5235805 100644 --- a/installer/build/boot/x86/adamdgtk.cfg +++ b/installer/build/boot/x86/adamdgtk.cfg @@ -1,24 +1,24 @@ label amd64-expert menu label 64 bit expert install kernel ${KERNEL} - append priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE} + append priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE} label amd64-rescue menu label 64 bit rescue mode kernel ${KERNEL} - append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE} + append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} 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 + append auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE} +label amd64-experttxt + menu label 64 bit text-based expert install kernel ${KERNEL} - append priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE} -label amd64-rescuegui - menu label 64 bit graphical rescue mode + append priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE} +label amd64-rescuetxt + menu label 64 bit text-based rescue mode kernel ${KERNEL} - append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE} -label amd64-autogui - menu label 64 bit graphical automated install + append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE} +label amd64-autotxt + menu label 64 bit text-based automated install kernel ${KERNEL} - append auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE} + append auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE} diff --git a/installer/build/boot/x86/adgtk.cfg b/installer/build/boot/x86/adgtk.cfg index 6a22ca9..c4db078 100644 --- a/installer/build/boot/x86/adgtk.cfg +++ b/installer/build/boot/x86/adgtk.cfg @@ -4,24 +4,24 @@ menu width 58 label expert menu label ^Expert install kernel ${KERNEL} - append priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE} + append priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE} label rescue menu label ^Rescue mode kernel ${KERNEL} - append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE} + append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} 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 + append auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE} +label experttxt + menu label Text-based expert install kernel ${KERNEL} - append priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE} -label rescuegui - menu label Graphical rescue mode + append priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE} +label rescuetxt + menu label Text-based rescue mode kernel ${KERNEL} - append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true -- quiet ${CONSOLE} -label autogui - menu label Graphical automated install + append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE} +label autotxt + menu label Text-based automated install kernel ${KERNEL} - append auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE} + append auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE} diff --git a/installer/build/boot/x86/amdgtk.cfg b/installer/build/boot/x86/amdgtk.cfg index c0f9a6f..c1474e6 100644 --- a/installer/build/boot/x86/amdgtk.cfg +++ b/installer/build/boot/x86/amdgtk.cfg @@ -1,9 +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} +label amd64-installtxt + menu label 64 bit text-based install + kernel ${KERNEL} + append ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE} diff --git a/installer/build/boot/x86/f3.txt.withgtk b/installer/build/boot/x86/f3.txt.withgtk index 89587e7..4c833dc 100644 --- a/installer/build/boot/x86/f3.txt.withgtk +++ b/installer/build/boot/x86/f3.txt.withgtk @@ -4,12 +4,12 @@ 0finstall07 Start the installation -- this is the default ${MEDIA_TYPE} install. -0finstallgui07 - Start the installation using the graphical installer. +0finstalltxt07 + Start the installation using the text-based installer. 0fexpert07 Start the installation in expert mode, for maximum control. -0fexpertgui07 - Start the installation in expert mode using the graphical installer. +0fexperttxt07 + Start the installation in expert mode using the text-based installer. To use one of these boot methods, type it at the prompt, optionally followed by any boot parameters. For example: diff --git a/installer/build/boot/x86/f4.txt.withgtk b/installer/build/boot/x86/f4.txt.withgtk index 4cc7c7c..5a1b321 100644 --- a/installer/build/boot/x86/f4.txt.withgtk +++ b/installer/build/boot/x86/f4.txt.withgtk @@ -4,8 +4,8 @@ 0frescue07 Boot into rescue mode. -0frescuegui07 - Boot into rescue mode using the graphical installer. +0frescuetxt07 + Boot into rescue mode using the text-based installer. diff --git a/installer/build/boot/x86/gtk.cfg b/installer/build/boot/x86/gtk.cfg index 5605060..f289e1a 100644 --- a/installer/build/boot/x86/gtk.cfg +++ b/installer/build/boot/x86/gtk.cfg @@ -1,9 +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} +label installtxt + menu label ^Text-based install + kernel ${KERNEL} + append ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
Attachment:
signature.asc
Description: This is a digitally signed message part.