[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#259296: ia64 menus patch fixes 259296 and 267689



This patch adds menu support to the CD install for ia64.  It supplies 
the following:

1. autoboot of CDs

2. manual updates reflecting the new functionality

3. support for booting a 2.6 kernel.  (full 2.6 support
  is another matter and another patch)

4. fixes bug 267689 (kernel does not find usb keyboard)

Issues to be resolved:
---------------------------------

* bug 267689 was caused by the version on the udeb being out of
  sync with the kernel it packages.  The config file now handles this
  but could again be a problem.  The version mismatch triggers
  a makefile rule to fail to depmod on the initrd modules directory.
  This in turn causes modprobe (busybox) to fail to load any
  modules... 

* The kernels called out in the config are possibly out of date.  If
   so, please fix *all* KERNEL*VERSION* references accordingly.

* The manual update needs to be translated.
-- 
*************
Jim Lieb			Wild Open Source Inc.
lieb@wildopensource.com		Cell: 831.295.9317
Office: 831.421.0883            Fax:  831.421.0885
Index: build/boot/ia64/general.msg
===================================================================
--- build/boot/ia64/general.msg	(revision 0)
+++ build/boot/ia64/general.msg	(revision 0)
@@ -0,0 +1,25 @@
+ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß 
+10 
+ 7fÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´ 74General Screen7f ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ70¿10
+ 7f³70                                                                            ³10
+ 7f³70    There are four ways to install Debian from this CD. You can install     ³10
+ 7f³70    with either a 2.4 series kernel or the new 2.6 kernel.  Expert mode     ³10
+ 7f³70    gives you more control over the configuration of the system by          ³10
+ 7f³70    giving you the option to change configuration parameters and control    ³10
+ 7f³70    which packages are loaded.  Normal mode installs the default set of     ³10
+ 7f³70    packages and automatically configures them with the default settings.   ³10
+ 7f³70                                                                            ³10
+ 7f³70    The 2.4 series Linux kernels are appropriate in existing environments   ³10
+ 7f³70    where Linux 2.4 is already in production on other systems.  The 2.6     ³10
+ 7f³70    kernel series is more appropriate for environments where the new        ³10
+ 7f³70    functions and performance improvements are more important than          ³10
+ 7f³70    compatibility with other systems.                                       ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                  Press any key to return to main screen                    ³10
+ 7f³70                                                                            ³10
+ 7f³70 Help: [71F170-General]  [71F270-Params]                                            ³10
+ 7fÀ70ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ10
Index: build/boot/ia64/params.msg
===================================================================
--- build/boot/ia64/params.msg	(revision 0)
+++ build/boot/ia64/params.msg	(revision 0)
@@ -0,0 +1,25 @@
+ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß 
+10 
+ 7fÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´ 74Params Screen7f ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ70¿10
+ 7f³70                                                                            ³10
+ 7f³70   You can enter boot parameters on the Boot: line.                         ³10
+ 7f³70                                                                            ³10
+ 7f³70   For the serial console:        console=ttyS0,9600n8                      ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                   Press any key to return to main screen                   ³10
+ 7f³70                                                                            ³10
+ 7f³70 Help: [71F170-General]  [71F270-Params]                                            ³10
+ 7fÀ70ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ10
Index: build/boot/ia64/elilo-cd.conf
===================================================================
--- build/boot/ia64/elilo-cd.conf	(revision 18778)
+++ build/boot/ia64/elilo-cd.conf	(working copy)
@@ -1,9 +1,24 @@
 # Load up initrd on boot.
+chooser=textmenu
 default=Linux
 delay=20
+prompt
+append="devfs=mount,dall"
 
+message=/efi/boot/elilo_menu.msg
+f1=/efi/boot/general.msg
+f2=/efi/boot/params.msg
+
 image=/linux
   label=Linux
+  description="Install with Linux 2.4"
   initrd=/initrd.gz
-  append="ramdisk_size=24576 devfs=mount,dall"
-  root=/dev/ram0
+  append="ramdisk_size=${RAMDISK_SIZE}"
+  root=/dev/ram
+
+image=/linux
+  label=Expert
+  description="Install in Expert mode with Linux 2.4"
+  initrd=/initrd.gz
+  append="ramdisk_size=${RAMDISK_SIZE} DEBCONF_PRIORITY=low"
+  root=/dev/ram
Index: build/boot/ia64/elilo_menu.msg
===================================================================
--- build/boot/ia64/elilo_menu.msg	(revision 0)
+++ build/boot/ia64/elilo_menu.msg	(revision 0)
@@ -0,0 +1,25 @@
+ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß 
+10 
+ 7fÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´ 74Debian Installation Disk7f ÃÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ70¿10
+ 7f³70 This is a Debian installation ${MEDIA_TYPE}, built on ${BUILD_DATE}.                   ³10
+ 7f³70                                                                            ³10
+ 7f³70 Use the arrow keys to select a menu item and then Enter to select it.      ³10
+ 7f³70 Use the function keys for help.                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70 7eBeware that this is an install disk, and misuse can result in the loss of  70³10
+ 7f³70 7eany data currently on your disks.                                          70³10
+ 7f³70                                                                            ³10
+ 7f³70            ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ7f¿70              ³10
+ 7f³70            ³70                                                7f³70             ³10
+ 7f³70            ³70                                                7f³70              ³10
+ 7f³70            ³70                                                7f³70              ³10
+ 7f³70            ³70                                                1e7f³70             ³10
+ 7f³70            À7fÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ70              ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70                                                                            ³10
+ 7f³70 Boot: 35                                                                  70   ³10
+ 7f³70                                                                            ³10
+ 7f³70 Help: [71F170-General]  [71F270-Params]                                            ³10
+ 7fÀ70ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ10
Index: build/boot/ia64/elilo-cd.conf.with26
===================================================================
--- build/boot/ia64/elilo-cd.conf.with26	(revision 0)
+++ build/boot/ia64/elilo-cd.conf.with26	(revision 0)
@@ -0,0 +1,38 @@
+# Load up initrd on boot.
+chooser=textmenu
+default=Linux
+delay=20
+prompt
+#append="devfs=mount,dmknod,dreg,dchange"
+
+message=/efi/boot/elilo_menu.msg
+f1=/efi/boot/general.msg
+f2=/efi/boot/params.msg
+
+image=/linux
+  label=Linux
+  description="Install with Linux 2.4"
+  initrd=/initrd.gz
+  append="devfs=mount ramdisk_size=${RAMDISK_SIZE}"
+  root=/dev/ram
+
+image=/linux
+  label=Expert
+  description="Install in Expert mode with Linux 2.4"
+  initrd=/initrd.gz
+  append="devfs=mount ramdisk_size=${RAMDISK_SIZE} DEBCONF_PRIORITY=low"
+  root=/dev/ram
+
+image=/linux26
+  label=Linux26
+  description="Install with Linux 2.6"
+  initrd=/initrd26.gz
+  append="devfs=mount ramdisk_size=${RAMDISK_SIZE_26}"
+  root=/dev/ram
+
+image=/linux26
+  label=Expert26
+  description="Install in Expert mode with Linux 2.6"
+  initrd=/initrd26.gz
+  append="devfs=mount ramdisk_size=${RAMDISK_SIZE_26} DEBCONF_PRIORITY=low"
+  root=/dev/ram
Index: build/config/ia64.cfg
===================================================================
--- build/config/ia64.cfg	(revision 18778)
+++ build/config/ia64.cfg	(working copy)
@@ -1,14 +1,17 @@
 # How big a floppy image should I make? (in kilobytes)
-FLOPPY_SIZE = 10240
+#FLOPPY_SIZE = 10240
+FLOPPY_SIZE = 20480
 
 MEDIUM_SUPPORTED = cdrom netboot miniiso
 
 # The version of the kernel to use.
 KERNELMAJOR = 2.4
-KERNELVERSION = 2.4.26-itanium-smp
+KERNELVERSION = 2.4.26-1-itanium-smp
+KERNELVERSION_2.6 = 2.6.7-1-itanium-smp
 KERNEL_FLAVOUR = di
 KERNELNAME = vmlinuz
-KERNELIMAGEVERSION = $(KERNELVERSION)
+KERNELIMAGEVERSION = 2.4.26-itanium-smp
+KERNELIMAGEVERSION_2.6 = $(KERNELVERSION_2.6)
 
 # The DOS volume id to use for DOS floppies. This is a 32 bit hexidecimal
 # number.
@@ -30,11 +33,39 @@
 	mmd -i$(TEMP_BOOT) ::/efi/boot
 	mcopy -i$(TEMP_BOOT) $(TEMP_KERNEL) ::/linux
 	mcopy -i$(TEMP_BOOT) $(TEMP_INITRD) ::/initrd.gz
+	if [ -n "$(KERNEL_2.6)" ] && [ -n "$(INITRD_2.6)" ]; then \
+		mcopy -i$(TEMP_BOOT) $(KERNEL_2.6) ::/linux26; \
+		mcopy -i$(TEMP_BOOT) $(INITRD_2.6) ::/initrd26.gz; \
+	fi
 	mcopy -i$(TEMP_BOOT) /usr/lib/elilo/elilo.efi ::/efi/boot/bootia64.efi
 	mcopy -i$(TEMP_BOOT) /usr/lib/elilo/elilo.efi ::/elilo.efi
-	mcopy -i$(TEMP_BOOT) boot/ia64/elilo-cd.conf ::/elilo.conf
-	mcopy -i$(TEMP_BOOT) boot/ia64/elilo-cd.conf ::/efi/boot/elilo.conf
+	mcopy -i$(TEMP_BOOT) $(TEMP_BOOT_SCREENS)/elilo-cd.conf ::/elilo.conf
+	mcopy -i$(TEMP_BOOT) $(TEMP_BOOT_SCREENS)/elilo-cd.conf ::/efi/boot/elilo.conf
+	mcopy -i$(TEMP_BOOT) $(TEMP_BOOT_SCREENS)/elilo_menu.msg ::/efi/boot/elilo_menu.msg
+	mcopy -i$(TEMP_BOOT) boot/ia64/general.msg ::/efi/boot/general.msg
+	mcopy -i$(TEMP_BOOT) boot/ia64/params.msg ::/efi/boot/params.msg
 	echo "elilo linux" | mcopy -i$(TEMP_BOOT) - ::/install.nsh
 
+.PHONY: arch_boot_screens
 arch_boot_screens:
+	-rm -f $(TEMP_BOOT_SCREENS)/*
+	mkdir -p $(TEMP_BOOT_SCREENS)
+	cat boot/ia64/elilo_menu.msg | ./bootscreen-subst "$(MEDIA_TYPE)" \
+		"$(DEBIAN_VERSION)" "$(BUILD_DATE)" \
+		 > $(TEMP_BOOT_SCREENS)/elilo_menu.msg
+	(if [ -n "$(INITRD_2.6)" ] && [ -n "$(KERNEL_2.6)" ]; then \
+		cat boot/ia64/elilo-cd.conf.with26; \
+	else \
+		cat boot/ia64/elilo-cd.conf; \
+	fi) \
+	| ./ramdisk-size-subst $(TEMP_INITRD) $(INITRD_2.6) \
+		> $(TEMP_BOOT_SCREENS)/elilo-cd.conf
 	
+.PHONY: arch_miniiso
+arch_miniiso:
+	-rm -rf $(TEMP_CD_TREE)/*
+	install -m 644 -D $(BASE_TMP)miniiso/boot.img \
+		$(TEMP_CD_TREE)/boot/boot.img
+
+	mkisofs -no-emul-boot -J -o $(TEMP_MINIISO) -b boot/boot.img \
+		-c boot/boot.catalog $(TEMP_CD_TREE)
Index: build/config/ia64/cdrom.cfg
===================================================================
--- build/config/ia64/cdrom.cfg	(revision 18778)
+++ build/config/ia64/cdrom.cfg	(working copy)
@@ -1,5 +1,14 @@
+FLAVOUR_SUPPORTED = "" 2.6
+
 MEDIA_TYPE = CD-ROM
 
-TARGET = $(BOOT)
+# add the 2.6 images to the boot.img
+EXTRATARGETS = build_cdrom_2.6
+INITRD_2.6 = dest/cdrom/2.6/initrd.gz
+KERNEL_2.6 = dest/cdrom/2.6/vmlinuz
+TARGET = $(KERNEL) $(INITRD) $(BOOT)
+EXTRANAME = $(MEDIUM)/
 
 MANIFEST-BOOT = "CDROM image for Itanium systems"
+MANIFEST-INITRD = "CDROM boot initrd"
+MANIFEST-KERNEL = "CDROM boot kernel"
Index: build/config/ia64/cdrom/2.6.cfg
===================================================================
--- build/config/ia64/cdrom/2.6.cfg	(revision 0)
+++ build/config/ia64/cdrom/2.6.cfg	(revision 0)
@@ -0,0 +1,8 @@
+KERNELVERSION = $(KERNELVERSION_2.6)
+KERNELIMAGEVERSION = $(KERNELIMAGEVERSION_2.6)
+KERNELMAJOR = 2.6
+EXTRANAME = 2.6/
+INITRD_FS = cramfs
+
+EXTRATARGETS =
+TARGET = $(KERNEL) $(INITRD)
Index: build/config/ia64/miniiso.cfg
===================================================================
--- build/config/ia64/miniiso.cfg	(revision 18778)
+++ build/config/ia64/miniiso.cfg	(working copy)
@@ -1,3 +1,5 @@
+FLAVOUR_SUPPORTED = "" 2.6
+
 MEDIA_TYPE = CD-ROM
 
 TYPE = netboot
@@ -2,2 +4,6 @@
 
+# add the 2.6 images to the boot.img
+EXTRATARGETS = build_miniiso_2.6
+INITRD_2.6 = dest/cdrom/2.6/initrd.gz
+KERNEL_2.6 = dest/cdrom/2.6/vmlinuz
 TARGET = $(TEMP_BOOT) $(MINIISO)
@@ -7,9 +13,3 @@
 
 MANIFEST-MINIISO = "tiny bootable CD image for pure network install"
 
-.PHONY: arch_miniiso arch_boot_screens arch_boot
-arch_miniiso:
-	-rm -rf $(TEMP_CD_TREE)/*
-	install -m 644 -D $(BASE_TMP)miniiso/boot.img $(TEMP_CD_TREE)/boot/boot.img
-
-	mkisofs -no-emul-boot -J -o $(TEMP_MINIISO) -b boot/boot.img -c boot/boot.catalog $(TEMP_CD_TREE)
Index: build/config/ia64/miniiso/2.6.cfg
===================================================================
--- build/config/ia64/miniiso/2.6.cfg	(revision 0)
+++ build/config/ia64/miniiso/2.6.cfg	(revision 0)
@@ -0,0 +1,8 @@
+KERNELVERSION = $(KERNELVERSION_2.6)
+KERNELIMAGEVERSION = $(KERNELIMAGEVERSION_2.6)
+KERNELMAJOR = 2.6
+EXTRANAME = 2.6/
+INITRD_FS = cramfs
+
+EXTRATARGETS =
+TARGET = $(KERNEL) $(INITRD)
Index: build/config/ia64/netboot.cfg
===================================================================
--- build/config/ia64/netboot.cfg	(revision 18778)
+++ build/config/ia64/netboot.cfg	(working copy)
@@ -1,5 +1,11 @@
+FLAVOUR_SUPPORTED = "" 2.6
+
 MEDIA_TYPE = netboot image
 
+# add the 2.6 images to the boot.img
+EXTRATARGETS = build_netboot_2.6
+INITRD_2.6 = dest/netboot/2.6/initrd.gz
+KERNEL_2.6 = dest/netboot/2.6/vmlinuz
 TARGET = $(INITRD) $(KERNEL) $(MISC)
 EXTRANAME = $(MEDIUM)/
 
Index: build/config/ia64/netboot/2.6.cfg
===================================================================
--- build/config/ia64/netboot/2.6.cfg	(revision 0)
+++ build/config/ia64/netboot/2.6.cfg	(revision 0)
@@ -0,0 +1,8 @@
+KERNELVERSION = $(KERNELVERSION_2.6)
+KERNELIMAGEVERSION = $(KERNELIMAGEVERSION_2.6)
+KERNELMAJOR = 2.6
+EXTRANAME = 2.6/
+INITRD_FS = cramfs
+
+EXTRATARGETS =
+TARGET = $(KERNEL) $(INITRD)
Index: build/pkg-lists/cdrom/ia64.cfg
===================================================================
--- build/pkg-lists/cdrom/ia64.cfg	(revision 18778)
+++ build/pkg-lists/cdrom/ia64.cfg	(working copy)
@@ -8,6 +8,9 @@
 discover1-udeb
 kbd-chooser
 usb-discover
+fat-modules-${kernel:Version}
+ext3-modules-${kernel:Version}
+reiserfs-modules-${kernel:Version}
 nic-modules-${kernel:Version}
 ide-core-modules-${kernel:Version}
 ide-modules-${kernel:Version}
Index: doc/manual/en/boot-installer/ia64.xml
===================================================================
--- doc/manual/en/boot-installer/ia64.xml	(revision 18778)
+++ doc/manual/en/boot-installer/ia64.xml	(working copy)
@@ -61,12 +61,8 @@
 The partitioning task also verifies that a suitable EFI partition is
 present before allowing the installation to proceed.
 
-</para>
+</para><para>
 
-  <sect3 arch="ia64" id="boot-from-cd">
-  <title>Booting from the EFI Shell</title>
-<para>
-
 The EFI Boot Manager is started as the last step of the firmware
 initialization.
 It displays a menu list from which the user can select
@@ -74,8 +70,96 @@
 Depending on the model of system and what other software has been
 loaded on the system, this menu may be different from one system
 to another.
-In any event, there should be one option called
-<command>EFI Shell [Built-in]</command>.
+There should be two menu items displayed,
+<command>Boot Option Maintenance Menu</command> and
+<command>EFI Shell (Built-in)</command>.
+Using the first option is preferred, however, if that
+option is not available or the CD for some reason does not
+boot with it, use the second option.
+
+</para>
+
+  <warning>
+  <title>IMPORTANT</title>
+<para>
+The EFI Poot Manager will select a default boot action, typically
+the first menu choice, within a pre-set number of seconds.
+This is indicated by a countdown at the bottom of the screen.
+Once the timer expires and the systems starts the default action,
+you will have to reboot the machine in order to continue the installation.
+</para>
+  </warning>
+
+  <sect3 arch="ia64" id="bootable-cd">
+  <title>Option 1: Booting from the Boot Option Maintenance Menu</title>
+<para>
+
+</para>
+
+<itemizedlist>
+
+<listitem><para>
+Insert the CD in the DVD/CD drive and reboot the machine.
+The firmware will display the EFI Boot Manager page and menu after
+it completes its system diagnostics.
+</para></listitem>
+
+<listitem><para>
+Select <command>Boot Maintenance Menu</command> from the menu
+with the arrow keys and press <command>ENTER</command>.
+This will display a new menu.
+</para></listitem>
+
+<listitem><para>
+Select <command>Boot From a File</command> from the menu
+with the arrow keys and press <command>ENTER</command>.
+This will display a list of devices probed by the firmware.
+You should see two menu lines containing either the label
+<command>Debian Inst [Acpi ...</command> or
+<command>Removable Media Boot</command>.
+If you examine the rest of the menu line, you will notice that
+the device and controller information should be the same.
+</para></listitem>
+
+<listitem><para>
+You can choose either of the entries that refer to the CD/DVD
+drive.
+Select your choice with the arrow keys and press <command>ENTER</command>.
+If you choose <command>Removable Media Boot</command> the machine
+will immediately start the boot load sequence.
+If you choose <command>Debian Inst [Acpi ...</command> instead, it
+will display a directory listing of the bootable portion of the
+CD, requiring you to proceed to the next (additional) step.
+</para></listitem>
+
+<listitem><para>
+You will only need this step if you chose
+<command>Debian Inst [Acpi ...</command>.
+The directory listing will also show
+<command>[Treat like Removable Media Boot]</command> on the next to
+the last line.
+Select this line with the arrow keys and press <command>ENTER</command>.
+This will start the boot load sequence.
+</para></listitem>
+
+</itemizedlist>
+
+<para>
+
+These steps start the Debian boot loader which will display a
+menu page for you to select a boot kernel and options.
+Proceed to selecting the boot kernel and options.
+
+</para>
+  </sect3>
+
+  <sect3 arch="ia64" id="boot-with-efi">
+  <title>Option 2: Booting from the EFI Shell</title>
+<para>
+
+If, for some reason, option 1 is not successful, reboot the machine
+and when the EFI Boot Manager screen appears there should be
+one option called <command>EFI Shell [Built-in]</command>.
 Boot the Debian Installer CD with the following steps:
 
 </para>
@@ -83,12 +167,15 @@
 <itemizedlist>
 
 <listitem><para>
-Insert the CD in the DVD/CD drive.
+Insert the CD in the DVD/CD drive and reboot the machine.
+The firmware will display the EFI Boot Manager page and menu after
+it completes its system diagnostics.
 </para></listitem>
 
 <listitem><para>
-Select <command>EFI Shell</command> from the menu.
-The EFI Shell will read all of the bootable devices and display
+Select <command>EFI Shell</command> from the menu with the arrow keys
+and press <command>ENTER</command>.
+The EFI Shell will scan all of the bootable devices and display
 them to the console before displaying its command prompt.
 The recognized bootable partitions on devices will show a device name of
 <filename>fs<emphasis>n</emphasis>:</filename>.
@@ -107,43 +194,119 @@
 </para></listitem>
 
 <listitem><para>
-Enter <command>fs<emphasis>n</emphasis>:</command> to select that
+Enter <command>fs<emphasis>n</emphasis>:</command> and press
+<command>ENTER</command> to select that
 device where <emphasis>n</emphasis> is the partition number for the
 CDROM.  The shell will now display the partition number as its prompt.
 </para></listitem>
 
 <listitem><para>
-Enter <command>elilo</command>.
-This will start the boot loader.
-<classname>elilo</classname> will display its prompt and wait for
-a kernel name to load.
-It will pick the default kernel if it receives no input within
-the timelimit (~20 seconds).
+Enter <command>elilo</command> and press <command>ENTER</command>.
+This will start the boot load sequence.
 </para></listitem>
 
-<listitem><para>
-Select a boot option, typically <classname>linux</classname> or
-<classname>linux26</classname>.
-Simply press <emphasis>Enter</emphasis> or wait for the timeout
-to take the default.
-It will display messages as it uncompresses the kernel and loads
-and uncompresses the initial root filesystem.
-</para></listitem>
-
 </itemizedlist>
 
 <para> 
 
-These steps start the installer kernel.
+As with option 1, these steps start the Debian boot loader which will
+display a menu page for you to select a boot kernel and options.
 You can also enter the shorter 
 <command>fs<emphasis>n</emphasis>:elilo</command> command at
 the shell prompt.
-Once the kernel finishes its initialization along with the usual console
-messages, it will start the Debian Installer.
+Proceed to selecting the boot kernel and options.
 
 </para>
 
   </sect3>
+
+  <sect3 arch="ia64" id="kernel-option-menu">
+  <title>Selecting the Boot Kernel and Options</title>
+
+<para>
+
+The boot loader will display a form with a menu list and a text
+window with a <classname>Boot:</classname> prompt.
+The arrow keys select an item from the menu and any text typed
+at the keyboard will appear in the text window.
+There are also help screens which can be displayed by pressing
+the appropriate function key.
+The <classname>General</classname> help screen explains the menu
+choices and the <classname>Params</classname> screen explains
+the common command line options.
+
+</para>
+
+   <warning>
+   <title>Serial Console</title>
+<para>
+
+Some IA64 platforms have both a serial console and a keyboard and
+video card which can be configured in the EFI firmware to be
+the system console.
+The EFI console is capable of displaying and accepting input from
+both the keyboard and video and the serial port.
+The Linux kernel will take the keyboard and video devices as its
+default console if it detects a keyboard during its initialization.
+You will have to enable the serial console in the EFI boot
+manager and enter
+<command>console=ttyS0,9600n8</command> into
+the <classname>Boot:</classname> text window to install via
+the serial console.
+If you are using a serial console and forget to set it in the
+command line, you
+will be able to select the kernel and enter parameters but both
+the display and your input will go dead as soon as the kernel starts,
+requiring you to either reboot if your system does not have a keyboard
+and video display installed.
+</para></warning>
+
+<para>
+
+Consult the <classname>General</classname> help screen for the
+description of the kernels and install modes most appropriate
+for your installation.
+You should also consult <xref linkend="boot-parms"/> below for any additional
+parameters that you may want to set in the <classname>Boot:</classname>
+text window.
+The kernel version you choose selects the kernel version that will be
+used for both the installation process and the installed system.
+If you encounter kernel problems with the installation, you may also
+have those same problems with the system you install.
+The following two steps will select and start the install:
+
+</para>
+
+<itemizedlist>
+
+<listitem><para>
+Select the kernel version and installation mode most
+appropriate to your needs with the arrow keys.
+</para></listitem>
+
+<listitem><para>
+Enter any boot parameters by typing at the keyboard.
+The text will be displayed directly in the text window.
+This is where the serial console is set.
+</para></listitem>
+
+<listitem><para>
+Press <command>ENTER</command>.  This will load and start the
+kernel.
+The kernel will display its usual initialization messages followed
+by the first screen of the Debian Installer.
+</para></listitem> 
+
+</itemizedlist>
+
+  </sect3>
+
+<para>
+
+Proceed to the next chapter to continue the installation where you will
+set up the language locale, network, and disk partitions.
+
+</para>
   </sect2>
 
   <sect2 arch="ia64" id="boot-tftp"><title>Booting with TFTP</title>

Reply to: