[gentoo-doc-cvs] cvs commit: hb-install-amd64-bootloader.xml

[Xavier Neys]

neysx       05/11/21 18:29:51

  Modified:    xml/htdocs/doc/en/handbook hb-install-amd64-bootloader.xml
                        hb-install-x86-bootloader.xml
  Log:
  #108493 grub.conf examples should include /boot/ for kernel and initrd

Revision  Changes    Path
1.36      +28 -19    xml/htdocs/doc/en/handbook/hb-install-amd64-bootloader.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-install-amd64-bootloader.xml?rev=1.36&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-install-amd64-bootloader.xml?rev=1.36&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-install-amd64-bootloader.xml.diff?r1=1.35&r2=1.36&cvsroot=gentoo

Index: hb-install-amd64-bootloader.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-amd64-bootloader.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- hb-install-amd64-bootloader.xml	22 Oct 2005 00:17:35 -0000	1.35
+++ hb-install-amd64-bootloader.xml	21 Nov 2005 18:29:51 -0000	1.36
@@ -4,12 +4,12 @@
 <!-- The content of this document is licensed under the CC-BY-SA license -->
 <!-- See http://creativecommons.org/licenses/by-sa/1.0 -->
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-amd64-bootloader.xml,v 1.35 2005/10/22 00:17:35 yoswink Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-amd64-bootloader.xml,v 1.36 2005/11/21 18:29:51 neysx Exp $ -->
 
 <sections>
 
-<version>2.7</version>
-<date>2005-10-22</date>
+<version>2.8</version>
+<date>2005-11-21</date>
 
 <section>
 <title>Making your Choice</title>
@@ -182,7 +182,7 @@
 To install GRUB, let's first emerge it. 
 </p>
 
-<pre caption = "Installing GRUB">
+<pre caption="Installing GRUB">
 # <i>emerge grub</i>
 </pre>
 
@@ -194,7 +194,7 @@
 editor):
 </p>
 
-<pre caption = "Creating /boot/grub/grub.conf">
+<pre caption="Creating /boot/grub/grub.conf">
 # <i>nano -w /boot/grub/grub.conf</i>
 </pre>
 
@@ -221,19 +221,19 @@
 line since JFS needs to replay its log before it allows read-write mounting.
 </note>
 
-<pre caption = "grub.conf for non-genkernel users">
+<pre caption="grub.conf for non-genkernel users">
 <comment># Which listing to boot as default. 0 is the first, 1 the second etc.</comment>
 default 0
 <comment># How many seconds to wait before the default listing is booted.</comment>
 timeout 30
 <comment># Nice, fat splash-image to spice things up :)
 # Comment out if you don't have a graphics card installed</comment>
-splashimage=(hd0,0)/grub/splash.xpm.gz
+splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 
 title=Gentoo Linux 2.6.12
 <comment># Partition where the kernel image (or operating system) is located</comment>
 root (hd0,0)
-kernel /kernel-2.6.12-gentoo-r6 root=/dev/hda3
+kernel /boot/kernel-2.6.12-gentoo-r6 root=/dev/hda3
 
 <comment># The next four lines are only if you dualboot with a Windows system.</comment>
 <comment># In this case, Windows is hosted on /dev/hda6.</comment>
@@ -244,15 +244,15 @@
 </pre>
 
 
-<pre caption = "grub.conf for genkernel users">
+<pre caption="grub.conf for genkernel users">
 default 0
 timeout 30
-splashimage=(hd0,0)/grub/splash.xpm.gz
+splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 
 title=Gentoo Linux 2.6.12
 root (hd0,0)
-kernel /kernel-2.6.12-gentoo-r6 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
-initrd /initramfs-genkernel-amd64-2.6.12-gentoo-r6
+kernel /boot/kernel-2.6.12-gentoo-r6 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
+initrd /boot/initramfs-genkernel-amd64-2.6.12-gentoo-r6
 
 <comment># Only in case you want to dual-boot</comment>
 title=Windows XP
@@ -267,14 +267,23 @@
 (which is the default behaviour).
 </note>
 
-<note>
-If you use a different partitioning scheme and/or kernel image, adjust 
-accordingly. However, make sure that anything that follows a GRUB-device 
-(such as <path>(hd0,0)</path>) is relative to the mountpoint, not the root. In 
-other words, <path>(hd0,0)/grub/splash.xpm.gz</path> is in reality 
-<path>/boot/grub/splash.xpm.gz</path> since <path>(hd0,0)</path> is 
+<p>
+If you used a different partitioning scheme and/or kernel image, adjust
+accordingly. However, make sure that anything that follows a GRUB-device (such
+as <path>(hd0,0)</path>) is relative to the mountpoint, not the root. In other
+words, <path>(hd0,0)/grub/splash.xpm.gz</path> is in reality
+<path>/boot/grub/splash.xpm.gz</path> since <path>(hd0,0)</path> is
 <path>/boot</path>.
-</note>
+</p>
+
+<p>
+Besides, if you chose to use a different partitioning scheme and did not put
+<path>/boot</path> in a separate partition, the <path>/boot</path> prefix used
+in the above code samples is really <e>required</e>. If you followed our
+suggested partitioning plan, the <path>/boot</path> prefix it not required, but
+a <path>boot</path> symlink makes it work. In short, the above examples should
+work whether you defined a separate <path>/boot</path> partition or not.
+</p>
 
 <p>
 If you need to pass any additional options to the kernel, simply add



1.38      +31 -23    xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml

file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml?rev=1.38&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml?rev=1.38&content-type=text/plain&cvsroot=gentoo
diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml.diff?r1=1.37&r2=1.38&cvsroot=gentoo

Index: hb-install-x86-bootloader.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- hb-install-x86-bootloader.xml	17 Sep 2005 20:09:19 -0000	1.37
+++ hb-install-x86-bootloader.xml	21 Nov 2005 18:29:51 -0000	1.38
@@ -2,14 +2,14 @@
 <!DOCTYPE sections SYSTEM "/dtd/book.dtd">
 
 <!-- The content of this document is licensed under the CC-BY-SA license -->
-<!-- See http://creativecommons.org/licenses/by-sa/1.0 -->
+<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml,v 1.37 2005/09/17 20:09:19 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml,v 1.38 2005/11/21 18:29:51 neysx Exp $ -->
 
 <sections>
 
-<version>2.6</version>
-<date>2005-09-17</date>
+<version>2.7</version>
+<date>2005-11-21</date>
 
 <section>
 <title>Making your Choice</title>
@@ -201,7 +201,7 @@
 To install GRUB, let's first emerge it:
 </p>
 
-<pre caption = "Installing GRUB">
+<pre caption="Installing GRUB">
 # <i>emerge grub</i>
 </pre>
 
@@ -212,7 +212,7 @@
 <c>nano</c> (or, if applicable, another editor):
 </p>
 
-<pre caption = "Creating /boot/grub/grub.conf">
+<pre caption="Creating /boot/grub/grub.conf">
 # <i>nano -w /boot/grub/grub.conf</i>
 </pre>
 
@@ -241,19 +241,19 @@
 line since JFS needs to replay its log before it allows read-write mounting.
 </note>
 
-<pre caption = "grub.conf for non-genkernel users">
+<pre caption="grub.conf for non-genkernel users">
 <comment># Which listing to boot as default. 0 is the first, 1 the second etc.</comment>
 default 0
 <comment># How many seconds to wait before the default listing is booted.</comment>
 timeout 30
 <comment># Nice, fat splash-image to spice things up :)
 # Comment out if you don't have a graphics card installed</comment>
-splashimage=(hd0,0)/grub/splash.xpm.gz
+splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 
 title=Gentoo Linux 2.6.11-r3
 <comment># Partition where the kernel image (or operating system) is located</comment>
 root (hd0,0)
-kernel /kernel-2.6.11-gentoo-r3 root=/dev/hda3
+kernel /boot/kernel-2.6.11-gentoo-r3 root=/dev/hda3
 
 <comment># The next four lines are only if you dualboot with a Windows system.</comment>
 <comment># In this case, Windows is hosted on /dev/hda6.</comment>
@@ -263,16 +263,15 @@
 chainloader +1
 </pre>
 
-
-<pre caption = "grub.conf for genkernel users">
+<pre caption="grub.conf for genkernel users">
 default 0
 timeout 30
-splashimage=(hd0,0)/grub/splash.xpm.gz
+splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 
 title=Gentoo Linux 2.6.11-r3
 root (hd0,0)
-kernel /kernel-genkernel-x86-2.6.11-gentoo-r3 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
-initrd /initramfs-genkernel-x86-2.6.11-gentoo-r3
+kernel /boot/kernel-genkernel-x86-2.6.11-gentoo-r3 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
+initrd /boot/initramfs-genkernel-x86-2.6.11-gentoo-r3
 
 <comment># Only in case you want to dual-boot</comment>
 title=Windows XP
@@ -287,14 +286,23 @@
 (which is the default behaviour).
 </note>
 
-<note>
-If you use a different partitioning scheme and/or kernel image, adjust 
-accordingly. However, make sure that anything that follows a GRUB-device 
-(such as <path>(hd0,0)</path>) is relative to the mountpoint, not the root. In 
-other words, <path>(hd0,0)/grub/splash.xpm.gz</path> is in reality 
-<path>/boot/grub/splash.xpm.gz</path> since <path>(hd0,0)</path> is 
+<p>
+If you used a different partitioning scheme and/or kernel image, adjust
+accordingly. However, make sure that anything that follows a GRUB-device (such
+as <path>(hd0,0)</path>) is relative to the mountpoint, not the root. In other
+words, <path>(hd0,0)/grub/splash.xpm.gz</path> is in reality
+<path>/boot/grub/splash.xpm.gz</path> since <path>(hd0,0)</path> is
 <path>/boot</path>.
-</note>
+</p>
+
+<p>
+Besides, if you chose to use a different partitioning scheme and did not put
+<path>/boot</path> in a separate partition, the <path>/boot</path> prefix used
+in the above code samples is really <e>required</e>. If you followed our
+suggested partitioning plan, the <path>/boot</path> prefix it not required, but
+a <path>boot</path> symlink makes it work. In short, the above examples should
+work whether you defined a separate <path>/boot</path> partition or not.
+</p>
 
 <p>
 If you need to pass any additional options to the kernel, simply add
@@ -382,7 +390,7 @@
 in the right commands to install the GRUB boot record onto your hard drive.
 </p>
 
-<pre caption =" Starting the GRUB shell">
+<pre caption=" Starting the GRUB shell">
 # <i>grub</i>
 </pre>
 
@@ -414,7 +422,7 @@
 Now go on, configure GRUB, shall we? :-)
 </p>
 
-<pre caption =" Installing GRUB in the MBR">
+<pre caption=" Installing GRUB in the MBR">
 grub&gt; <i>root (hd0,0)</i>          <comment>(Specify where your /boot partition resides)</comment>
 grub&gt; <i>setup (hd0)</i>           <comment>(Install GRUB in the MBR)</comment>
 grub&gt; <i>quit</i>                  <comment>(Exit the GRUB shell)</comment>



-- 
gentoo-doc-cvs@g.o mailing list