Gentoo Archives: gentoo-doc-cvs

From: "Jan Kundrat (jkt)" <jkt@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en/handbook: hb-install-ppc-bootloader.xml hb-install-x86+amd64-bootloader.xml
Date: Thu, 14 Apr 2011 09:32:30
Message-Id: 20110414093213.1D7E220054@flycatcher.gentoo.org
1 jkt 11/04/14 09:32:13
2
3 Modified: hb-install-ppc-bootloader.xml
4 hb-install-x86+amd64-bootloader.xml
5 Log:
6 #360261, remove extra init=/linuxrc, ramdisk=... and root=...
7
8 Revision Changes Path
9 1.49 xml/htdocs/doc/en/handbook/hb-install-ppc-bootloader.xml
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-ppc-bootloader.xml?rev=1.49&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-ppc-bootloader.xml?rev=1.49&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-ppc-bootloader.xml?r1=1.48&r2=1.49
14
15 Index: hb-install-ppc-bootloader.xml
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-ppc-bootloader.xml,v
18 retrieving revision 1.48
19 retrieving revision 1.49
20 diff -u -r1.48 -r1.49
21 --- hb-install-ppc-bootloader.xml 16 Mar 2011 07:45:13 -0000 1.48
22 +++ hb-install-ppc-bootloader.xml 14 Apr 2011 09:32:12 -0000 1.49
23 @@ -1,6 +1,6 @@
24 <?xml version='1.0' encoding='UTF-8'?>
25 <!DOCTYPE sections SYSTEM "/dtd/book.dtd">
26 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-ppc-bootloader.xml,v 1.48 2011/03/16 07:45:13 nightmorph Exp $ -->
27 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-ppc-bootloader.xml,v 1.49 2011/04/14 09:32:12 jkt Exp $ -->
28
29 <!-- The content of this document is licensed under the CC-BY-SA license -->
30 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
31 @@ -14,8 +14,8 @@
32 needs.
33 </abstract>
34
35 -<version>10.2</version>
36 -<date>2011-03-16</date>
37 +<version>11</version>
38 +<date>2011-04-14</date>
39
40 <section>
41 <title>Making your Choice</title>
42 @@ -101,7 +101,7 @@
43 initrd=/boot/<keyval id="genkernel-initrd"/>
44 <comment># You can add additional kernel arguments to append such as
45 # rootdelay=10 for a USB/Firewire Boot</comment>
46 - append="real_root=/dev/sda3 init=/linuxrc"
47 + append="real_root=/dev/sda3"
48 read-only
49 <comment>##########################################################</comment>
50 </pre>
51 @@ -507,7 +507,7 @@
52 [SECTION]
53 Local HD -> Genkernel (Normal)
54 ide:0 <keyval id="genkernel-name"/> root=/dev/ram0
55 -real_root=/dev/sda3 init=/linuxrc initrd=<keyval id="genkernel-initrd"/>
56 +real_root=/dev/sda3 initrd=<keyval id="genkernel-initrd"/>
57 </pre>
58
59 <p>
60
61
62
63 1.22 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml
64
65 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.22&view=markup
66 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.22&content-type=text/plain
67 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?r1=1.21&r2=1.22
68
69 Index: hb-install-x86+amd64-bootloader.xml
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v
72 retrieving revision 1.21
73 retrieving revision 1.22
74 diff -u -r1.21 -r1.22
75 --- hb-install-x86+amd64-bootloader.xml 20 Jul 2010 05:14:55 -0000 1.21
76 +++ hb-install-x86+amd64-bootloader.xml 14 Apr 2011 09:32:13 -0000 1.22
77 @@ -4,12 +4,12 @@
78 <!-- The content of this document is licensed under the CC-BY-SA license -->
79 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
80
81 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.21 2010/07/20 05:14:55 nightmorph Exp $ -->
82 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.22 2011/04/14 09:32:13 jkt Exp $ -->
83
84 <sections>
85
86 -<version>6.7</version>
87 -<date>2010-07-16</date>
88 +<version>7</version>
89 +<date>2011-04-14</date>
90
91 <section>
92 <title>Making your Choice</title>
93 @@ -250,7 +250,7 @@
94
95 title Gentoo Linux <keyval id="kernel-version"/>
96 root (hd0,0)
97 -kernel /boot/<keyval id="genkernel-name"/> root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/sda3
98 +kernel /boot/<keyval id="genkernel-name"/> real_root=/dev/sda3
99 initrd /boot/<keyval id="genkernel-initrd"/>
100
101 <comment># Only in case you want to dual-boot</comment>
102 @@ -520,8 +520,7 @@
103 image=/boot/<keyval id="genkernel-name"/>
104 label=gentoo
105 read-only
106 - root=/dev/ram0
107 - append="init=/linuxrc ramdisk=8192 real_root=/dev/sda3"
108 + append="real_root=/dev/sda3"
109 initrd=/boot/<keyval id="genkernel-initrd"/>
110
111 <comment># The next two lines are only if you dualboot with a Windows system.</comment>