Gentoo Archives: gentoo-doc-cvs

From: Sven Vermeulen <swift@×××××××××××.org>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] cvs commit: hb-install-x86-bootloader.xml
Date: Sat, 30 Jul 2005 14:57:25
Message-Id: 200507301456.j6UEuJ6h025000@robin.gentoo.org
1 swift 05/07/30 14:56:57
2
3 Modified: xml/htdocs/doc/en/handbook hb-install-x86-bootloader.xml
4 Log:
5 #100711 - genkernels behaviour changed *again*
6
7 Revision Changes Path
8 1.34 +10 -11 xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml
9
10 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
11 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
12 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
13
14 Index: hb-install-x86-bootloader.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86-bootloader.xml,v
17 retrieving revision 1.33
18 retrieving revision 1.34
19 diff -u -r1.33 -r1.34
20 --- hb-install-x86-bootloader.xml 16 Apr 2005 20:37:42 -0000 1.33
21 +++ hb-install-x86-bootloader.xml 30 Jul 2005 14:56:57 -0000 1.34
22 @@ -4,12 +4,12 @@
23 <!-- The content of this document is licensed under the CC-BY-SA license -->
24 <!-- See http://creativecommons.org/licenses/by-sa/1.0 -->
25
26 -<!-- $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 $ -->
27 +<!-- $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 $ -->
28
29 <sections>
30
31 -<version>2.4</version>
32 -<date>2005-04-16</date>
33 +<version>2.5</version>
34 +<date>2005-07-30</date>
35
36 <section>
37 <title>Making your Choice</title>
38 @@ -219,7 +219,7 @@
39 <p>
40 Now we are going to write up a <path>grub.conf</path>. Below you'll
41 find two possible <path>grub.conf</path> for the partitioning example we use
42 -in this guide, with kernel image <path>kernel-2.6.11-gentoo-r3</path>. We've
43 +in this guide. We've
44 only extensively commented the first <path>grub.conf</path>. Make sure you use
45 <e>your</e> kernel image filename and, if appropriate, <e>your</e> initrd image
46 filename.
47 @@ -271,8 +271,8 @@
48
49 title=Gentoo Linux 2.6.11-r3
50 root (hd0,0)
51 -kernel /kernel-2.6.11-gentoo-r3 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
52 -initrd /initrd-2.6.11-gentoo-r3
53 +kernel /kernel-genkernel-x86-2.6.11-gentoo-r3 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
54 +initrd /initramfs-genkernel-x86-2.6.11-gentoo-r3
55
56 <comment># Only in case you want to dual-boot</comment>
57 title=Windows XP
58 @@ -489,9 +489,8 @@
59
60 <p>
61 Some sections ago we have asked you to remember the kernel-image name
62 -you have created. In the next example <path>lilo.conf</path> we assume
63 -the imagename is <path>kernel-2.6.11-gentoo-r3</path>. We also use the
64 -example partitioning scheme in this example. There are two separate parts:
65 +you have created. In the next example <path>lilo.conf</path> we use the
66 +example partitioning scheme. There are two separate parts:
67 </p>
68
69 <ul>
70 @@ -527,12 +526,12 @@
71 root=/dev/hda3 <comment># Location of the root filesystem</comment>
72
73 <comment># For genkernel users</comment>
74 -image=/boot/kernel-2.6.11-gentoo-r3
75 +image=/boot/kernel-genkernel-x86-2.6.11-gentoo-r3
76 label=gentoo
77 read-only
78 root=/dev/ram0
79 append="init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev"
80 - initrd=/boot/initrd-2.6.11-gentoo-r3
81 + initrd=/boot/initramfs-genkernel-2.6.11-gentoo-r3
82
83 <comment># The next two lines are only if you dualboot with a Windows system.</comment>
84 <comment># In this case, Windows is hosted on /dev/hda6.</comment>
85
86
87
88 --
89 gentoo-doc-cvs@g.o mailing list