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.50) id 1EStiU-00041B-Ig for garchives@archives.gentoo.org; Fri, 21 Oct 2005 10:01:38 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.5/8.13.5) with SMTP id j9L9xFwH010028; Fri, 21 Oct 2005 09:59:15 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [134.68.220.30]) by robin.gentoo.org (8.13.5/8.13.5) with ESMTP id j9L9xE7Z024168 for ; Fri, 21 Oct 2005 09:59:14 GMT Message-Id: <200510210959.j9L9xE7Z024168@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 1EStin-0003tR-B3 for gentoo-doc-cvs@lists.gentoo.org; Fri, 21 Oct 2005 10:01:57 +0000 Received: by lark.gentoo.org (sSMTP sendmail emulation); Fri, 21 Oct 2005 10:01:48 +0000 From: "Xavier Neys" Date: Fri, 21 Oct 2005 10:01:48 +0000 To: gentoo-doc-cvs@lists.gentoo.org Subject: [gentoo-doc-cvs] cvs commit: hb-install-amd64-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: 13f3efe9-bdd8-4c3c-9250-6db135abe882 X-Archives-Hash: dbc0f448e55387c19a5773b8944c8d13 neysx 05/10/21 10:01:48 Modified: xml/htdocs/doc/en/handbook/2005.1 hb-install-amd64-bootloader.xml Log: #109835 Made kernel names consistent Revision Changes Path 1.5 +8 -8 xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-bootloader.xml file : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-bootloader.xml?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=gentoo plain: http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-bootloader.xml?rev=1.5&content-type=text/plain&cvsroot=gentoo diff : http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-bootloader.xml.diff?r1=1.4&r2=1.5&cvsroot=gentoo Index: hb-install-amd64-bootloader.xml =================================================================== RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2005.1/hb-install-amd64-bootloader.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hb-install-amd64-bootloader.xml 7 Sep 2005 18:50:37 -0000 1.4 +++ hb-install-amd64-bootloader.xml 21 Oct 2005 10:01:48 -0000 1.5 @@ -4,12 +4,12 @@ - + -5.1 -2005-08-12 +5.2 +2005-10-21
Making your Choice @@ -201,7 +201,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-r1. We've +in this guide, with kernel image kernel-2.6.12-gentoo-r6. We've only extensively commented the first grub.conf.

@@ -233,7 +233,7 @@ title=Gentoo Linux 2.6.11 Gentoo r1 # Partition where the kernel image (or operating system) is located root (hd0,0) -kernel /kernel-2.6.11-gentoo-r1 root=/dev/hda3 +kernel /kernel-2.6.12-gentoo-r6 root=/dev/hda3 # The next four lines are only if you dualboot with a Windows system. # In this case, Windows is hosted on /dev/hda6. @@ -249,10 +249,10 @@ timeout 30 splashimage=(hd0,0)/grub/splash.xpm.gz -title=Gentoo Linux 2.6.11-gentoo-r1 +title=Gentoo Linux 2.6.12-gentoo-r6 root (hd0,0) -kernel /kernel-2.6.11-gentoo-r1 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev -initrd /initramfs-genkernel-amd64-2.6.11-gentoo-r1 +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 # Only in case you want to dual-boot title=Windows XP -- gentoo-doc-cvs@gentoo.org mailing list