From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.43) id 1DysmD-0002th-6h for garchives@archives.gentoo.org; Sat, 30 Jul 2005 14:57:25 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.4/8.13.4) with SMTP id j6UEuKaH005710; Sat, 30 Jul 2005 14:56:20 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [134.68.220.30]) by robin.gentoo.org (8.13.4/8.13.4) with ESMTP id j6UEuJ6h025000 for ; Sat, 30 Jul 2005 14:56:19 GMT Message-Id: <200507301456.j6UEuJ6h025000@robin.gentoo.org> Received: from lark.gentoo.osuosl.org ([140.211.166.177] helo=lark.gentoo.org) by smtp.gentoo.org with smtp (Exim 4.43) id 1Dyslx-00080z-LF for gentoo-doc-cvs@lists.gentoo.org; Sat, 30 Jul 2005 14:57:09 +0000 Received: by lark.gentoo.org (sSMTP sendmail emulation); Sat, 30 Jul 2005 14:56:57 +0000 From: "Sven Vermeulen" Date: Sat, 30 Jul 2005 14:56:57 +0000 To: gentoo-doc-cvs@lists.gentoo.org Subject: [gentoo-doc-cvs] cvs commit: hb-install-x86-bootloader.xml Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-doc-cvs@gentoo.org Reply-to: docs-team@lists.gentoo.org X-Archives-Salt: a33a4c75-bf05-47ef-8215-36f7db94f339 X-Archives-Hash: e7f46b07c6f016f2dc7cefa4322a419b 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 @@ - + -2.4 -2005-04-16 +2.5 +2005-07-30
Making your Choice @@ -219,7 +219,7 @@

Now we are going to write up a grub.conf. Below you'll find two possible grub.conf for the partitioning example we use -in this guide, with kernel image kernel-2.6.11-gentoo-r3. We've +in this guide. We've only extensively commented the first grub.conf. Make sure you use your kernel image filename and, if appropriate, your 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 # Only in case you want to dual-boot title=Windows XP @@ -489,9 +489,8 @@

Some sections ago we have asked you to remember the kernel-image name -you have created. In the next example lilo.conf we assume -the imagename is kernel-2.6.11-gentoo-r3. We also use the -example partitioning scheme in this example. There are two separate parts: +you have created. In the next example lilo.conf we use the +example partitioning scheme. There are two separate parts:

    @@ -527,12 +526,12 @@ root=/dev/hda3 # Location of the root filesystem # For genkernel users -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 # The next two lines are only if you dualboot with a Windows system. # In this case, Windows is hosted on /dev/hda6. -- gentoo-doc-cvs@gentoo.org mailing list