Gentoo Archives: gentoo-commits

From: "Sven Vermeulen (swift)" <swift@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in xml/htdocs/doc/en/handbook: hb-install-x86+amd64-bootloader.xml
Date: Tue, 31 Dec 2013 20:29:29
Message-Id: 20131231202924.2D6B020034@flycatcher.gentoo.org
1 swift 13/12/31 20:29:24
2
3 Modified: hb-install-x86+amd64-bootloader.xml
4 Log:
5 Fix bug #496558 - make partitioning more consistent, add note about "strange" partitions in example with dualboot
6
7 Revision Changes Path
8 1.39 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.39&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.39&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?r1=1.38&r2=1.39
13
14 Index: hb-install-x86+amd64-bootloader.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v
17 retrieving revision 1.38
18 retrieving revision 1.39
19 diff -u -r1.38 -r1.39
20 --- hb-install-x86+amd64-bootloader.xml 18 Dec 2013 10:13:54 -0000 1.38
21 +++ hb-install-x86+amd64-bootloader.xml 31 Dec 2013 20:29:23 -0000 1.39
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/2.5 -->
25
26 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.38 2013/12/18 10:13:54 swift Exp $ -->
27 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.39 2013/12/31 20:29:23 swift Exp $ -->
28
29 <sections>
30
31 -<version>22</version>
32 -<date>2013-12-18</date>
33 +<version>23</version>
34 +<date>2013-12-31</date>
35
36 <section>
37 <title>Making your Choice</title>
38 @@ -433,6 +433,14 @@
39 line since JFS needs to replay its log before it allows read-write mounting.
40 </note>
41
42 +<note>
43 +If dualboot with Windows is used, the partitioning example used in this
44 +book will not be sufficient (our example uses all four primary partitions
45 +for Linux, whereas at least one would need to be extended if Windows is
46 +installed on a logical partition). Please proceed with caution and consider
47 +the listing to be an example that needs to be modified to suit your own needs.
48 +</note>
49 +
50 <pre caption="Example grub.conf">
51 <comment># Which listing to boot as default. 0 is the first, 1 the second etc.</comment>
52 default 0
53 @@ -445,12 +453,12 @@
54 title Gentoo Linux <keyval id="kernel-version"/>
55 <comment># Partition where the kernel image (or operating system) is located</comment>
56 root (hd0,1)
57 -kernel /boot/<keyval id="kernel-name"/> root=/dev/sda3
58 +kernel /boot/<keyval id="kernel-name"/> root=/dev/sda4
59
60 title Gentoo Linux <keyval id="kernel-version"/> (rescue)
61 <comment># Partition where the kernel image (or operating system) is located</comment>
62 root (hd0,1)
63 -kernel /boot/<keyval id="kernel-name"/> root=/dev/sda3 init=/bin/bb
64 +kernel /boot/<keyval id="kernel-name"/> root=/dev/sda4 init=/bin/bb
65
66 <comment># The next four lines are only if you dualboot with a Windows system.</comment>
67 <comment># In this case, Windows is hosted on /dev/sda6.</comment>
68 @@ -469,7 +477,7 @@
69 <pre caption="GRUB snippet for initramfs-enabled kernel builds">
70 title Gentoo Linux <keyval id="kernel-version"/>
71 root (hd0,1)
72 -kernel /boot/<keyval id="kernel-version"/> <i>real_</i>root=/dev/sda3
73 +kernel /boot/<keyval id="kernel-version"/> <i>real_</i>root=/dev/sda4
74 <i>initrd /boot/<keyval id="genkernel-initrd"/></i>
75 </pre>
76
77 @@ -494,7 +502,7 @@
78 <p>
79 If you need to pass any additional options to the kernel, simply add them to the
80 end of the kernel command. We're already passing one option
81 -(<c>root=/dev/sda3</c> or <c>real_root=/dev/sda3</c>), but you can pass others
82 +(<c>root=/dev/sda4</c> or <c>real_root=/dev/sda4</c>), but you can pass others
83 as well, such as the <c>video</c> statement for framebuffer as we discussed
84 previously.
85 </p>
86 @@ -637,7 +645,7 @@
87 If you want to install GRUB in a certain partition instead of the MBR,
88 you have to alter the <c>setup</c> command so it points to the right
89 partition. For instance, if you want GRUB installed in
90 -<path>/dev/sda4</path>, then the command becomes <c>setup (hd0,4)</c>.
91 +<path>/dev/sda4</path>, then the command becomes <c>setup (hd0,3)</c>.
92 Few users however want to do this.
93 </note>