swift 05/07/30 14:56:57 Modified: xml/htdocs/doc/en/handbook hb-install-x86-bootloader.xml Log: #100711 - genkernels behaviour changed *again*
Revision Changes Path 1.34 +10 -11 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.34&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.34&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.33&r2=1.34&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.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- hb-install-x86-bootloader.xml 16 Apr 2005 20:37:42 -0000 1.33 +++ hb-install-x86-bootloader.xml 30 Jul 2005 14:56:57 -0000 1.34 @@ -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-x86-bootloader.xml,v 1.33 2005/04/16 20:37:42 swift Exp $ --> +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml,v 1.34 2005/07/30 14:56:57 swift Exp $ --> <sections> -<version>2.4</version> -<date>2005-04-16</date> +<version>2.5</version> +<date>2005-07-30</date> <section> <title>Making your Choice</title> @@ -219,7 +219,7 @@ <p> Now we are going to write up a <path>grub.conf</path>. Below you'll find two possible <path>grub.conf</path> for the partitioning example we use -in this guide, with kernel image <path>kernel-2.6.11-gentoo-r3</path>. We've +in this guide. We've only extensively commented the first <path>grub.conf</path>. Make sure you use <e>your</e> kernel image filename and, if appropriate, <e>your</e> initrd image filename. @@ -271,8 +271,8 @@ title=Gentoo Linux 2.6.11-r3 root (hd0,0) -kernel /kernel-2.6.11-gentoo-r3 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev -initrd /initrd-2.6.11-gentoo-r3 +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 <comment># Only in case you want to dual-boot</comment> title=Windows XP @@ -489,9 +489,8 @@ <p> Some sections ago we have asked you to remember the kernel-image name -you have created. In the next example <path>lilo.conf</path> we assume -the imagename is <path>kernel-2.6.11-gentoo-r3</path>. We also use the -example partitioning scheme in this example. There are two separate parts: +you have created. In the next example <path>lilo.conf</path> we use the +example partitioning scheme. There are two separate parts: </p> <ul> @@ -527,12 +526,12 @@ root=/dev/hda3 <comment># Location of the root filesystem</comment> <comment># For genkernel users</comment> -image=/boot/kernel-2.6.11-gentoo-r3 +image=/boot/kernel-genkernel-x86-2.6.11-gentoo-r3 label=gentoo read-only root=/dev/ram0 append="init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev" - initrd=/boot/initrd-2.6.11-gentoo-r3 + initrd=/boot/initramfs-genkernel-2.6.11-gentoo-r3 <comment># The next two lines are only if you dualboot with a Windows system.</comment> <comment># In this case, Windows is hosted on /dev/hda6.</comment> -- [email protected] mailing list
