[patches.git] / gentoo-handbook-integrate-ia64-bootloader.patch

? blah.html
? handbook-sh.xml
? hb-install-sh-medium.xml
Index: handbook-ia64.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ia64.xml,v
retrieving revision 1.6
diff -u -p -r1.6 handbook-ia64.xml
--- handbook-ia64.xml	29 Nov 2006 15:35:24 -0000	1.6
+++ handbook-ia64.xml	13 Feb 2007 03:23:36 -0000
@@ -213,7 +213,7 @@ explains how to configure your kernel.
 The ia64 architecture uses the elilo bootloader.
 This chapter explains how to install and configure elilo.
 </abstract>
-  <include href="hb-install-ia64-bootloader.xml"/>
+  <include href="hb-install-x86+amd64-bootloader.xml"/>
 </chapter>
 
 <chapter>
Index: hb-install-x86+amd64-bootloader.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v
retrieving revision 1.6
diff -u -p -r1.6 hb-install-x86+amd64-bootloader.xml
--- hb-install-x86+amd64-bootloader.xml	2 Nov 2006 07:27:24 -0000	1.6
+++ hb-install-x86+amd64-bootloader.xml	13 Feb 2007 03:23:36 -0000
@@ -191,7 +191,7 @@ link="#lilo">LILO</uri>.
 </body>
 </subsection>
 </section>
-<section id="grub">
+<section id="grub" test="not(func:keyval('arch')='IA64')">
 <title>Default: Using GRUB</title>
 <subsection>
 <title>Understanding GRUB's terminology</title>
@@ -658,6 +658,78 @@ You can now continue with <uri link="#re
 </body>
 </subsection>
 </section>
+<section id="elilo" test="func:keyval('arch')='IA64'">
+<title>Alternative: Using ELILO</title>
+<subsection>
+<title>Installing ELILO</title>
+<body>
+
+<p>
+ELILO, the EFI LInuxLOader, is the standard Linux bootloader for
+<uri link="http://en.wikipedia.org/wiki/Extensible_Firmware_Interface">EFI</uri>
+based systems.  This includes all Itanium machines.
+</p>
+
+<pre caption="Installing elilo">
+# <i>emerge elilo</i>
+</pre>
+
+<p>
+You can find the configuration file at <path>/etc/elilo.conf</path> and a
+sample file in the typical docs dir <path>/usr/share/doc/elilo-&lt;ver&gt;/</path>.
+Here is another sample configuration:
+</p>
+
+<pre caption="/etc/elilo.conf example">
+boot=/dev/sda1
+delay=30
+timeout=50
+default=Gentoo
+append="console=ttyS0,9600"
+prompt
+
+image=/vmlinuz
+	label=Gentoo
+	root=/dev/sda2
+	read-only
+
+image=/vmlinuz.old
+	label=Gentoo.old
+	root=/dev/sda2
+	read-only
+</pre>
+
+<p>
+The <c>boot</c> line tells elilo the location of the boot partition (in this
+case, <path>/dev/sda1</path>).  The <c>delay</c> line sets the number of 10th
+of seconds before automatically booting the default when in non-interactive
+mode.  The <c>timeout</c> line is just like the delay line but for interactive
+mode.  The <c>default</c> line sets the default kernel entry (which is defined
+below).  The <c>append</c> line adds extra options to the kernel cmdline.  The
+<c>prompt</c> sets the default elilo behavior to interactive.
+</p>
+
+<p>
+The sections that start with <c>image</c> defines different bootable images.
+Each image has a nice <c>label</c>, a <c>root</c> filesystem, and will only
+mount the root filesystem <c>read-only</c>.
+</p>
+
+<p>
+When configuration is done, just run <c>elilo --efiboot</c>.  The
+<c>--efiboot</c> option adds a menu entry for Gentoo to the EFI Boot Manager.
+</p>
+
+<pre caption = "Applying the elilo configuration">
+# <i>elilo --efiboot</i>
+</pre>
+
+<p>
+Now continue with <uri link="#reboot">Rebooting the System</uri>.
+</p>
+</body>
+</subsection>
+</section>
 <section id="reboot">
 <title>Rebooting the System</title>
 <subsection>
@@ -668,12 +740,18 @@ Exit the chrooted environment and unmoun
 that one magical command you have been waiting for: <c>reboot</c>.
 </p>
 
-<pre caption="Unmounting all partitions and rebooting">
+<pre caption="Unmounting all partitions and rebooting" test="not(func:keyval('arch')='IA64')">
 # <i>exit</i>
 cdimage ~# <i>cd</i>
 cdimage ~# <i>umount /mnt/gentoo/boot /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo</i>
 cdimage ~# <i>reboot</i>
 </pre>
+<pre caption="Unmounting all partitions and rebooting" test="func:keyval('arch')='IA64'">
+# <i>exit</i>
+cdimage ~# <i>cd</i>
+cdimage ~# <i>umount /mnt/gentoo/boot /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo/sys /mnt/gentoo</i>
+cdimage ~# <i>reboot</i>
+</pre>
 
 <p>
 Of course, don't forget to remove the bootable CD, otherwise the CD will be
Commit	Line	Data
5e993f12	1	? blah.html
	2	? handbook-sh.xml
	3	? hb-install-sh-medium.xml
	4	Index: handbook-ia64.xml
	5	===================================================================
	6	RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/handbook-ia64.xml,v
	7	retrieving revision 1.6
	8	diff -u -p -r1.6 handbook-ia64.xml
	9	--- handbook-ia64.xml 29 Nov 2006 15:35:24 -0000 1.6
	10	+++ handbook-ia64.xml 13 Feb 2007 03:23:36 -0000
	11	@@ -213,7 +213,7 @@ explains how to configure your kernel.
	12	The ia64 architecture uses the elilo bootloader.
	13	This chapter explains how to install and configure elilo.
	14	</abstract>
	15	- <include href="hb-install-ia64-bootloader.xml"/>
	16	+ <include href="hb-install-x86+amd64-bootloader.xml"/>
	17	</chapter>
	18
	19	<chapter>
	20	Index: hb-install-x86+amd64-bootloader.xml
	21	===================================================================
	22	RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v
	23	retrieving revision 1.6
	24	diff -u -p -r1.6 hb-install-x86+amd64-bootloader.xml
	25	--- hb-install-x86+amd64-bootloader.xml 2 Nov 2006 07:27:24 -0000 1.6
	26	+++ hb-install-x86+amd64-bootloader.xml 13 Feb 2007 03:23:36 -0000
	27	@@ -191,7 +191,7 @@ link="#lilo">LILO</uri>.
	28	</body>
	29	</subsection>
	30	</section>
	31	-<section id="grub">
	32	+<section id="grub" test="not(func:keyval('arch')='IA64')">
	33	<title>Default: Using GRUB</title>
	34	<subsection>
	35	<title>Understanding GRUB's terminology</title>
	36	@@ -658,6 +658,78 @@ You can now continue with <uri link="#re
	37	</body>
	38	</subsection>
	39	</section>
	40	+<section id="elilo" test="func:keyval('arch')='IA64'">
	41	+<title>Alternative: Using ELILO</title>
	42	+<subsection>
	43	+<title>Installing ELILO</title>
	44	+<body>
	45	+
	46	+<p>
	47	+ELILO, the EFI LInuxLOader, is the standard Linux bootloader for
	48	+<uri link="http://en.wikipedia.org/wiki/Extensible_Firmware_Interface">EFI</uri>
	49	+based systems. This includes all Itanium machines.
	50	+</p>
	51	+
	52	+<pre caption="Installing elilo">
	53	+# <i>emerge elilo</i>
	54	+</pre>
	55	+
	56	+<p>
	57	+You can find the configuration file at <path>/etc/elilo.conf</path> and a
	58	+sample file in the typical docs dir <path>/usr/share/doc/elilo-<ver>/</path>.
	59	+Here is another sample configuration:
	60	+</p>
	61	+
	62	+<pre caption="/etc/elilo.conf example">
	63	+boot=/dev/sda1
	64	+delay=30
65	+timeout=50
66	+default=Gentoo
67	+append="console=ttyS0,9600"
68	+prompt
69	+
70	+image=/vmlinuz
71	+ label=Gentoo
72	+ root=/dev/sda2
73	+ read-only
74	+
75	+image=/vmlinuz.old
76	+ label=Gentoo.old
77	+ root=/dev/sda2
78	+ read-only
79	+</pre>
80	+
81	+<p>
82	+The <c>boot</c> line tells elilo the location of the boot partition (in this
83	+case, <path>/dev/sda1</path>). The <c>delay</c> line sets the number of 10th
84	+of seconds before automatically booting the default when in non-interactive
85	+mode. The <c>timeout</c> line is just like the delay line but for interactive
86	+mode. The <c>default</c> line sets the default kernel entry (which is defined
87	+below). The <c>append</c> line adds extra options to the kernel cmdline. The
88	+<c>prompt</c> sets the default elilo behavior to interactive.
89	+</p>
90	+
91	+<p>
92	+The sections that start with <c>image</c> defines different bootable images.
93	+Each image has a nice <c>label</c>, a <c>root</c> filesystem, and will only
94	+mount the root filesystem <c>read-only</c>.
95	+</p>
96	+
97	+<p>
98	+When configuration is done, just run <c>elilo --efiboot</c>. The
99	+<c>--efiboot</c> option adds a menu entry for Gentoo to the EFI Boot Manager.
100	+</p>
101	+
102	+<pre caption = "Applying the elilo configuration">
103	+# <i>elilo --efiboot</i>
104	+</pre>
105	+
106	+<p>
107	+Now continue with <uri link="#reboot">Rebooting the System</uri>.
108	+</p>
109	+</body>
110	+</subsection>
111	+</section>
112	<section id="reboot">
113	<title>Rebooting the System</title>
114	<subsection>
115	@@ -668,12 +740,18 @@ Exit the chrooted environment and unmoun
116	that one magical command you have been waiting for: <c>reboot</c>.
117	</p>
118
119	-<pre caption="Unmounting all partitions and rebooting">
120	+<pre caption="Unmounting all partitions and rebooting" test="not(func:keyval('arch')='IA64')">
121	# <i>exit</i>
122	cdimage ~# <i>cd</i>
123	cdimage ~# <i>umount /mnt/gentoo/boot /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo</i>
124	cdimage ~# <i>reboot</i>
125	</pre>
126	+<pre caption="Unmounting all partitions and rebooting" test="func:keyval('arch')='IA64'">
127	+# <i>exit</i>
128	+cdimage ~# <i>cd</i>
129	+cdimage ~# <i>umount /mnt/gentoo/boot /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo/sys /mnt/gentoo</i>
130	+cdimage ~# <i>reboot</i>
131	+</pre>
132
133	<p>
134	Of course, don't forget to remove the bootable CD, otherwise the CD will be