Gentoo Archives: gentoo-doc-cvs

From: Xavier Neys <neysx@×××××××××××.org>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] cvs commit: hb-install-x86+amd64-bootloader.xml hb-install-x86+amd64-disk.xml hb-install-x86+amd64-kernel.xml hb-install-x86+amd64-medium.xml
Date: Wed, 02 Aug 2006 21:16:15
Message-Id: 20060802211553.B37BE64637@smtp.gentoo.org
1 neysx 06/08/02 21:15:52
2
3 Modified: hb-install-x86+amd64-bootloader.xml
4 hb-install-x86+amd64-disk.xml
5 hb-install-x86+amd64-kernel.xml
6 hb-install-x86+amd64-medium.xml
7 Log:
8 Merged x86 & amd64
9
10 Revision Changes Path
11 1.2 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml?r1=1.1&r2=1.2
16
17 Index: hb-install-x86+amd64-bootloader.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- hb-install-x86+amd64-bootloader.xml 2 Aug 2006 21:15:02 -0000 1.1
24 +++ hb-install-x86+amd64-bootloader.xml 2 Aug 2006 21:15:52 -0000 1.2
25 @@ -4,12 +4,12 @@
26 <!-- The content of this document is licensed under the CC-BY-SA license -->
27 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
28
29 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.1 2006/08/02 21:15:02 neysx Exp $ -->
30 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-bootloader.xml,v 1.2 2006/08/02 21:15:52 neysx Exp $ -->
31
32 <sections>
33
34 -<version>2.13</version>
35 -<date>2006-05-28</date>
36 +<version>3.0</version>
37 +<date>2006-07-26</date>
38
39 <section>
40 <title>Making your Choice</title>
41 @@ -21,12 +21,19 @@
42 Now that your kernel is configured and compiled and the necessary system
43 configuration files are filled in correctly, it is time to install a
44 program that will fire up your kernel when you start the system. Such a
45 -program is called a <e>bootloader</e>. For x86, Gentoo Linux provides <uri
46 -link="#grub">GRUB</uri> and <uri link="#lilo">LILO</uri>. But before we
47 -install one of these two bootloaders, we inform you how to configure framebuffer
48 -(assuming you want it of course). With framebuffer you can run the Linux command
49 -line with (limited) graphical features (such as using the nice bootsplash
50 -image Gentoo provides).
51 +program is called a <e>bootloader</e>.
52 +</p>
53 +
54 +<p test="func:keyval('arch')='x86'">
55 +For x86, Gentoo Linux provides <uri
56 +link="#grub">GRUB</uri> and <uri link="#lilo">LILO</uri>.
57 +</p>
58 +
59 +<p>
60 +But before we install the bootloader, we inform you how to configure
61 +framebuffer (assuming you want it of course). With framebuffer you can run the
62 +Linux command line with (limited) graphical features (such as using the nice
63 +bootsplash image Gentoo provides).
64 </p>
65
66 </body>
67 @@ -37,18 +44,23 @@
68
69 <p>
70 <e>If</e> you have configured your kernel with framebuffer support (or you used
71 -<c>genkernel</c>'s default kernel configuration), you can activate it by adding
72 -a <c>vga</c> and/or a <c>video</c> statement to your bootloader configuration
73 +<c>genkernel</c> default kernel configuration), you can activate it by adding a
74 +<c>vga</c> and/or a <c>video</c> statement to your bootloader configuration
75 file.
76 </p>
77
78 -<p>
79 -First of all you need to know what type of framebuffer device you're using. If
80 +<p test="func:keyval('arch')='x86'">
81 +First of all, you need to know what type of framebuffer device you're using. If
82 you use a Gentoo patched kernel tree (such as <c>gentoo-sources</c>) you will
83 have had the possibility of selecting <c>vesafb-tng</c> as the <e>VESA driver
84 type</e> (which is default for these kernel sources). If this is the case, you
85 -are using <c>vesafb-tng</c> and do not need to set a <c>vga</c> statement.
86 -Otherwise you are using the <c>vesafb</c> driver and need to set the <c>vga</c>
87 +are using <c>vesafb-tng</c> and <e>do not need</e> to set a <c>vga</c>
88 +statement. Otherwise you are using the <c>vesafb</c> driver and <e>need</e> to
89 +set the <c>vga</c> statement.
90 +</p>
91 +
92 +<p test="func:keyval('arch')='AMD64'">
93 +64-bit systems must use the the <c>vesafb</c> driver, and need the <c>vga</c>
94 statement.
95 </p>
96
97 @@ -56,13 +68,14 @@
98 The <c>vga</c> statement controls the resolution and color depth of your
99 framebuffer screen for <c>vesafb</c>. As stated in
100 <path>/usr/src/linux/Documentation/fb/vesafb.txt</path> (which gets installed
101 -when you install a kernel source package), you need to pass the VESA number
102 +when you install a kernel source package), you need to pass the VESA number
103 corresponding to the requested resolution and color depth to it.
104 </p>
105
106 <p>
107 -The following table lists the available resolutions and colordepths and matches
108 -those against the value that you need to pass on to the <c>vga</c> statement.
109 +The following table lists the available resolutions and color depths and
110 +matches those against the value that you need to pass on to the <c>vga</c>
111 +statement.
112 </p>
113
114 <table>
115 @@ -107,8 +120,9 @@
116 The <c>video</c> statement controls framebuffer display options. It needs to be
117 given the framebuffer driver (<c>vesafb</c> for 2.6 kernels, or <c>vesa</c> for
118 2.4 kernels) followed by the control statements you wish to enable. All
119 -variables are listed in <path>/usr/src/linux/Documentation/fb/vesafb.txt</path>,
120 -but we'll inform you about three most-used options:
121 +variables are listed in
122 +<path>/usr/src/linux/Documentation/fb/vesafb.txt</path>. The most-used options
123 +are:
124 </p>
125
126 <table>
127 @@ -126,15 +140,15 @@
128 <tr>
129 <ti>mtrr:n</ti>
130 <ti>
131 - Setup MTRR registers. <c>n</c> can be:
132 - 0 - disabled
133 - 1 - uncachable
134 - 2 - write-back
135 - 3 - write-combining
136 + Setup MTRR registers. <c>n</c> can be:<br/>
137 + 0 - disabled<br/>
138 + 1 - uncachable<br/>
139 + 2 - write-back<br/>
140 + 3 - write-combining<br/>
141 4 - write-through
142 </ti>
143 </tr>
144 -<tr>
145 +<tr test="func:keyval('arch')='x86'">
146 <ti><c>mode</c></ti>
147 <ti>
148 (<c>vesafb-tng</c> only)<br/>
149 @@ -145,11 +159,28 @@
150 </tr>
151 </table>
152
153 +</body>
154 +<body test="func:keyval('arch')='AMD64'">
155 +
156 +<p>
157 +The result of those two statements could be something like <c>vga=0x318
158 +video=vesafb:mtrr:3,ywrap</c>. Write this setting down; you will need it
159 +shortly.
160 +</p>
161 +
162 +<p>
163 +While LILO does work on AMD64, Gentoo only supports using GRUB. Now continue by
164 +its <uri link="#grub">installation</uri>.
165 +</p>
166 +
167 +</body>
168 +<body test="func:keyval('arch')='x86'">
169 +
170 <p>
171 The result of those two statements could be something like <c>vga=0x318
172 video=vesafb:mtrr:3,ywrap</c> or
173 -<c>video=vesafb:mtrr:3,ywrap,1024x768-32@85</c>. Remember (or write down) this
174 -setting; you will need it shortly.
175 +<c>video=vesafb:mtrr:3,ywrap,1024x768-32@85</c>. Write this setting down; you
176 +will need it shortly.
177 </p>
178
179 <p>
180 @@ -171,24 +202,24 @@
181 GRUB refers to hard drives and partitions. Your Linux partition
182 <path>/dev/hda1</path> (for IDE drives) or <path>/dev/sda1</path> (for
183 SATA/SCSI drives) will most likely be called <path>(hd0,0)</path> under GRUB.
184 -Notice the parenthesis around the <path>hd0,0</path> - they are required.
185 +Notice the parentheses around the <path>hd0,0</path> - they are required.
186 </p>
187
188 <p>
189 -Hard drives count from zero rather than "a" and partitions start at zero
190 -rather than one. Be aware too that with the hd devices, only hard drives are
191 -counted, not atapi-ide devices such as cdrom players and burners. Also, the
192 -same construct is used with SCSI drives. (Normally they get higher numbers
193 +Hard drives count from zero rather than "a" and partitions start at zero
194 +rather than one. Be aware too that with the hd devices, only hard drives are
195 +counted, not atapi-ide devices such as cdrom players and burners. Also, the
196 +same construct is used with SCSI drives. (Normally they get higher numbers
197 than IDE drives except when the BIOS is configured to boot from SCSI devices.)
198 When you ask the BIOS to boot from a different hard disk (for instance your
199 primary slave), <e>that</e> harddisk is seen as <path>hd0</path>.
200 </p>
201
202 <p>
203 -Assuming you have a hard drive on <path>/dev/hda</path>, a cdrom player on
204 -<path>/dev/hdb</path>, a burner on <path>/dev/hdc</path>, a second hard drive
205 -on <path>/dev/hdd</path> and no SCSI hard drive, <path>/dev/hdd7</path> gets
206 -translated to <path>(hd1,6)</path>. It might sound tricky and tricky it is
207 +Assuming you have a hard drive on <path>/dev/hda</path>, a cdrom player on
208 +<path>/dev/hdb</path>, a burner on <path>/dev/hdc</path>, a second hard drive
209 +on <path>/dev/hdd</path> and no SCSI hard drive, <path>/dev/hdd7</path> gets
210 +translated to <path>(hd1,6)</path>. It might sound tricky and tricky it is
211 indeed, but as we will see, GRUB offers a tab completion mechanism
212 that comes handy for those of you having a lot of hard drives and
213 partitions and who are a little lost in the GRUB numbering scheme.
214 @@ -214,7 +245,7 @@
215
216 <p>
217 Although GRUB is now installed, we still need to write up a
218 -configuration file for it and place GRUB in our MBR so that GRUB automatically
219 +configuration file for it and place GRUB in our MBR so that GRUB automatically
220 boots your newly created kernel. Create <path>/boot/grub/grub.conf</path> with
221 <c>nano</c> (or, if applicable, another editor):
222 </p>
223 @@ -224,17 +255,16 @@
224 </pre>
225
226 <p>
227 -Now we are going to write up a <path>grub.conf</path>. Below you'll
228 -find two possible <path>grub.conf</path> for the partitioning example we use
229 -in this guide. We've
230 -only extensively commented the first <path>grub.conf</path>. Make sure you use
231 -<e>your</e> kernel image filename and, if appropriate, <e>your</e> initrd image
232 -filename.
233 +Now we are going to write up a <path>grub.conf</path>. Below you'll find two
234 +possible <path>grub.conf</path> for the partitioning example we use in this
235 +guide. We've only extensively commented the first <path>grub.conf</path>. Make
236 +sure you use <e>your</e> kernel image filename and, if appropriate, <e>your</e>
237 +initrd image filename.
238 </p>
239
240 <ul>
241 <li>
242 - The first <path>grub.conf</path> is for people who have not used
243 + The first <path>grub.conf</path> is for people who have not used
244 <c>genkernel</c> to build their kernel
245 </li>
246 <li>
247 @@ -257,10 +287,10 @@
248 # Comment out if you don't have a graphics card installed</comment>
249 splashimage=(hd0,0)/boot/grub/splash.xpm.gz
250
251 -title=Gentoo Linux 2.6.12-r10
252 +title=Gentoo Linux <keyval id="kernel-version"/>
253 <comment># Partition where the kernel image (or operating system) is located</comment>
254 root (hd0,0)
255 -kernel /boot/kernel-2.6.12-gentoo-r10 root=/dev/hda3
256 +kernel /boot/<keyval id="kernel-name"/> root=/dev/hda3
257
258 <comment># The next four lines are only if you dualboot with a Windows system.</comment>
259 <comment># In this case, Windows is hosted on /dev/hda6.</comment>
260 @@ -275,10 +305,10 @@
261 timeout 30
262 splashimage=(hd0,0)/boot/grub/splash.xpm.gz
263
264 -title=Gentoo Linux 2.6.12-r10
265 +title=Gentoo Linux <keyval id="kernel-version"/>
266 root (hd0,0)
267 -kernel /boot/kernel-genkernel-x86-2.6.12-gentoo-r10 root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
268 -initrd /boot/initramfs-genkernel-x86-2.6.12-gentoo-r10
269 +kernel /boot/<keyval id="genkernel-name"/> root=/dev/ram0 init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev
270 +initrd /boot/<keyval id="genkernel-initrd"/>
271
272 <comment># Only in case you want to dual-boot</comment>
273 title=Windows XP
274 @@ -314,8 +344,8 @@
275 <p>
276 If you need to pass any additional options to the kernel, simply add
277 them to the end of the kernel command. We're already passing one option
278 -(<c>root=/dev/hda3</c> or <c>real_root=/dev/hda3</c>), but you can pass others
279 -as well, such as the <c>video</c> and/or <c>vga</c> statements for framebuffer
280 +(<c>root=/dev/hda3</c> or <c>real_root=/dev/hda3</c>), but you can pass others
281 +as well, such as the <c>video</c> and/or <c>vga</c> statements for framebuffer
282 as we discussed previously.
283 </p>
284
285 @@ -332,7 +362,7 @@
286 </p>
287
288 <p>
289 -Now save the <path>grub.conf</path> file and exit. You still need to install
290 +Now save the <path>grub.conf</path> file and exit. You still need to install
291 GRUB in the MBR (Master Boot Record) so that GRUB is automatically executed when
292 you boot your system.
293 </p>
294 @@ -379,8 +409,8 @@
295
296 <p>
297 If you have more questions regarding GRUB, please consult the <uri
298 -link="http://www.gnu.org/software/grub/grub-faq.html">GRUB FAQ</uri> or the <uri
299 -link="http://www.gnu.org/software/grub/manual/">GRUB Manual</uri>.
300 +link="http://www.gnu.org/software/grub/grub-faq.html">GRUB FAQ</uri> or the
301 +<uri link="http://www.gnu.org/software/grub/manual/">GRUB Manual</uri>.
302 </p>
303
304 <p>
305 @@ -395,7 +425,7 @@
306
307 <p>
308 To start configuring GRUB, you type in <c>grub</c>. You'll be presented
309 -with the <path>grub&gt;</path> grub command-line prompt. Now, you need to type
310 +with the <path>grub&gt;</path> grub command-line prompt. Now, you need to type
311 in the right commands to install the GRUB boot record onto your hard drive.
312 </p>
313
314 @@ -405,17 +435,17 @@
315
316 <note>
317 If your system does not have any floppy drives, add the <c>--no-floppy</c>
318 -option to the above command to prevent grub from probing the (non-existing)
319 +option to the above command to prevent grub from probing the (non-existing)
320 floppy drives.
321 </note>
322
323 <p>
324 -In the example configuration we want to install GRUB so that it reads its
325 -information from the boot-partition <path>/dev/hda1</path>, and installs the
326 -GRUB boot record on the hard drive's MBR (master boot record) so that the first
327 -thing we see when we turn on the computer is the GRUB prompt. Of course, if you
328 -haven't followed the example configuration during the installation,
329 -change the commands accordingly.
330 +In the example configuration we want to install GRUB so that it reads its
331 +information from the boot partition <path><keyval id="/boot"/></path>, and
332 +installs the GRUB boot record on the hard drive's MBR (master boot record) so
333 +that the first thing we see when we turn on the computer is the GRUB prompt. Of
334 +course, if you haven't followed the example configuration during the
335 +installation, change the commands accordingly.
336 </p>
337
338 <p>
339 @@ -432,9 +462,9 @@
340 </p>
341
342 <pre caption="Installing GRUB in the MBR">
343 -grub&gt; <i>root (hd0,0)</i> <comment>(Specify where your /boot partition resides)</comment>
344 -grub&gt; <i>setup (hd0)</i> <comment>(Install GRUB in the MBR)</comment>
345 -grub&gt; <i>quit</i> <comment>(Exit the GRUB shell)</comment>
346 +grub&gt; <i>root (hd0,0)</i> <comment>(Specify where your /boot partition resides)</comment>
347 +grub&gt; <i>setup (hd0)</i> <comment>(Install GRUB in the MBR)</comment>
348 +grub&gt; <i>quit</i> <comment>(Exit the GRUB shell)</comment>
349 </pre>
350
351 <note>
352 @@ -451,12 +481,6 @@
353 link="http://www.gnu.org/software/grub/manual/">GRUB Manual</uri>.
354 </p>
355
356 -<note>
357 -When you reinstall a kernel, you do not need to copy over the files anymore.
358 -Just run <c>make install</c> after compiling the kernel; it will automatically
359 -copy the necessary files and adjust the GRUB configuration.
360 -</note>
361 -
362 <p>
363 Continue with <uri link="#reboot">Rebooting the System</uri>.
364 </p>
365 @@ -464,7 +488,7 @@
366 </body>
367 </subsection>
368 </section>
369 -<section id="lilo">
370 +<section id="lilo" test="func:keyval('arch')='x86'">
371 <title>Alternative: Using LILO</title>
372 <subsection>
373 <title>Installing LILO</title>
374 @@ -484,7 +508,7 @@
375 Installing LILO is a breeze; just use <c>emerge</c>.
376 </p>
377
378 -<pre caption = "Installing LILO">
379 +<pre caption="Installing LILO">
380 # <i>emerge lilo</i>
381 </pre>
382
383 @@ -500,14 +524,14 @@
384 consistency) and create the file.
385 </p>
386
387 -<pre caption = "Creating /etc/lilo.conf">
388 +<pre caption="Creating /etc/lilo.conf">
389 # <i>nano -w /etc/lilo.conf</i>
390 </pre>
391
392 <p>
393 Some sections ago we have asked you to remember the kernel-image name
394 you have created. In the next example <path>lilo.conf</path> we use the
395 -example partitioning scheme. There are two separate parts:
396 +example partitioning scheme. There are two separate parts:
397 </p>
398
399 <ul>
400 @@ -526,29 +550,29 @@
401
402 <note>
403 If your root filesystem is JFS, you <e>must</e> add a <c>append="ro"</c>
404 -line after each boot item since JFS needs to replay its log before it allows
405 +line after each boot item since JFS needs to replay its log before it allows
406 read-write mounting.
407 </note>
408
409 -<pre caption = "Example /etc/lilo.conf">
410 +<pre caption="Example /etc/lilo.conf">
411 boot=/dev/hda <comment># Install LILO in the MBR</comment>
412 prompt <comment># Give the user the chance to select another section</comment>
413 timeout=50 <comment># Wait 5 (five) seconds before booting the default section</comment>
414 default=gentoo <comment># When the timeout has passed, boot the "gentoo" section</comment>
415
416 <comment># For non-genkernel users</comment>
417 -image=/boot/kernel-2.6.12-gentoo-r10
418 +image=/boot/<keyval id="kernel-name"/>
419 label=gentoo <comment># Name we give to this section</comment>
420 read-only <comment># Start with a read-only root. Do not alter!</comment>
421 root=/dev/hda3 <comment># Location of the root filesystem</comment>
422
423 <comment># For genkernel users</comment>
424 -image=/boot/kernel-genkernel-x86-2.6.12-gentoo-r10
425 +image=/boot/<keyval id="genkernel-name"/>
426 label=gentoo
427 read-only
428 root=/dev/ram0
429 append="init=/linuxrc ramdisk=8192 real_root=/dev/hda3 udev"
430 - initrd=/boot/initramfs-genkernel-2.6.12-gentoo-r10
431 + initrd=/boot/<keyval id="genkernel-initrd"/>
432
433 <comment># The next two lines are only if you dualboot with a Windows system.</comment>
434 <comment># In this case, Windows is hosted on /dev/hda6.</comment>
435 @@ -573,8 +597,8 @@
436 <c>video</c> statement to enable framebuffer:
437 </p>
438
439 -<pre caption = "Using append to add kernel options">
440 -image=/boot/kernel-2.6.12-gentoo-r10
441 +<pre caption="Using append to add kernel options">
442 +image=/boot/<keyval id="kernel-name"/>
443 label=gentoo
444 read-only
445 root=/dev/hda3
446 @@ -593,24 +617,22 @@
447 should add <c>doscsi</c> as kernel option.
448 </p>
449
450 -
451 <p>
452 Now save the file and exit. To finish up, you have to run <c>/sbin/lilo</c> so
453 LILO can apply the <path>/etc/lilo.conf</path> to your system (i.e. install
454 -itself on the disk). Keep in mind that you'll also have to rerun
455 +itself on the disk). Keep in mind that you'll also have to run
456 <c>/sbin/lilo</c> every time you install a new kernel or make any changes to
457 the menu.
458 </p>
459
460 -<pre caption = "Finishing the LILO installation">
461 +<pre caption="Finishing the LILO installation">
462 # <i>/sbin/lilo</i>
463 </pre>
464
465 -<note>
466 -When you reinstall a kernel, you do not need to copy over the files anymore.
467 -Just run <c>make install</c> after compiling the kernel; it will automatically
468 -copy the necessary files and adjust the LILO configuration.
469 -</note>
470 +<p>
471 +If you have more questions regarding LILO, please consult its <uri
472 +link="http://en.wikipedia.org/wiki/LILO_(boot_loader)">wikipedia page</uri>.
473 +</p>
474
475 <p>
476 You can now continue with <uri link="#reboot">Rebooting the System</uri>.
477 @@ -625,7 +647,7 @@
478 <body>
479
480 <p>
481 -Exit the chrooted environment and unmount all mounted partitions. Then type in
482 +Exit the chrooted environment and unmount all mounted partitions. Then type in
483 that one magical command you have been waiting for: <c>reboot</c>.
484 </p>
485
486
487
488
489 1.2 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml
490
491 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?rev=1.2&view=markup
492 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?rev=1.2&content-type=text/plain
493 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?r1=1.1&r2=1.2
494
495 Index: hb-install-x86+amd64-disk.xml
496 ===================================================================
497 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml,v
498 retrieving revision 1.1
499 retrieving revision 1.2
500 diff -u -r1.1 -r1.2
501 --- hb-install-x86+amd64-disk.xml 2 Aug 2006 21:15:02 -0000 1.1
502 +++ hb-install-x86+amd64-disk.xml 2 Aug 2006 21:15:52 -0000 1.2
503 @@ -4,12 +4,12 @@
504 <!-- The content of this document is licensed under the CC-BY-SA license -->
505 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
506
507 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml,v 1.1 2006/08/02 21:15:02 neysx Exp $ -->
508 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml,v 1.2 2006/08/02 21:15:52 neysx Exp $ -->
509
510 <sections>
511
512 -<version>2.5</version>
513 -<date>2006-01-01</date>
514 +<version>2.6</version>
515 +<date>2006-07-26</date>
516
517 <section>
518 <title>Introduction to Block Devices</title>
519 @@ -49,8 +49,8 @@
520 <p>
521 Although it is theoretically possible to use a full disk to house your Linux
522 system, this is almost never done in practice. Instead, full disk block devices
523 -are split up in smaller, more manageable block devices. On x86 systems,
524 -these are called <e>partitions</e>.
525 +are split up in smaller, more manageable block devices. On <keyval id="arch"/>
526 +systems, these are called <e>partitions</e>.
527 </p>
528
529 <p>
530 @@ -86,10 +86,10 @@
531 <body>
532
533 <p>
534 -The x86 Installation CDs provide support for EVMS and LVM2. EVMS and LVM2
535 -increase the flexibility offered by your partitioning setup. During the
536 -installation instructions, we will focus on "regular" partitions, but it is
537 -still good to know EVMS and LVM2 are supported as well.
538 +The <keyval id="arch"/> Installation CDs provide support for EVMS and LVM2.
539 +EVMS and LVM2 increase the flexibility offered by your partitioning setup.
540 +During the installation instructions, we will focus on "regular" partitions,
541 +but it is still good to know EVMS and LVM2 are supported as well.
542 </p>
543
544 </body>
545 @@ -185,10 +185,10 @@
546 </ul>
547
548 <p>
549 -However, multiple partitions have one big disadvantage: if not configured
550 -properly, you might result in having a system with lots
551 -of free space on one partition and none on another. There is also a 15-partition
552 -limit for SCSI and SATA.
553 +However, multiple partitions have one big disadvantage: if not configured
554 +properly, you might result in having a system with lots of free space on one
555 +partition and none on another. There is also a 15-partition limit for SCSI and
556 +SATA.
557 </p>
558
559 <p>
560 @@ -305,9 +305,9 @@
561 </pre>
562
563 <p>
564 -This particular disk is configured to house seven Linux filesystems (each with a
565 -corresponding partition listed as "Linux") as well as a swap partition (listed
566 -as "Linux swap").
567 +This particular disk is configured to house seven Linux filesystems (each with
568 +a corresponding partition listed as "Linux") as well as a swap partition
569 +(listed as "Linux swap").
570 </p>
571
572 </body>
573 @@ -463,7 +463,6 @@
574 /dev/hda3 82 3876 28690200 83 Linux
575 </pre>
576
577 -
578 </body>
579 </subsection>
580 <subsection>
581 @@ -506,12 +505,19 @@
582 <title>Filesystems?</title>
583 <body>
584
585 -<p>
586 +<p test="func:keyval('arch')='x86'">
587 The Linux kernel supports various filesystems. We'll explain ext2, ext3,
588 ReiserFS, XFS and JFS as these are the most commonly used filesystems on Linux
589 systems.
590 </p>
591
592 +<p test="func:keyval('arch')='AMD64'">
593 +Several filesystems are available. Some of them are found stable on the amd64
594 +architecture, others aren't. The following filesystems are found to be stable:
595 +ext2 and ext3. jfs and reiserfs may work but need more testing. If you're
596 +really adventurous you can try the unsupported filesystems.
597 +</p>
598 +
599 <p>
600 <b>ext2</b> is the tried and true Linux filesystem but doesn't have metadata
601 journaling, which means that routine ext2 filesystem checks at startup time can
602 @@ -580,7 +586,7 @@
603 </tr>
604 <tr>
605 <ti>ext3</ti>
606 - <ti><c>mke2fs -j</c></ti>
607 + <ti><c>mke2fs -j -O dir_index</c></ti>
608 </tr>
609 <tr>
610 <ti>reiserfs</ti>
611 @@ -604,7 +610,7 @@
612
613 <pre caption="Applying a filesystem on a partition">
614 # <i>mke2fs /dev/hda1</i>
615 -# <i>mke2fs -j /dev/hda3</i>
616 +# <i>mke2fs -j -O dir_index /dev/hda3</i>
617 </pre>
618
619 <p>
620
621
622
623 1.2 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml
624
625 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?rev=1.2&view=markup
626 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?rev=1.2&content-type=text/plain
627 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml?r1=1.1&r2=1.2
628
629 Index: hb-install-x86+amd64-kernel.xml
630 ===================================================================
631 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml,v
632 retrieving revision 1.1
633 retrieving revision 1.2
634 diff -u -r1.1 -r1.2
635 --- hb-install-x86+amd64-kernel.xml 2 Aug 2006 21:15:02 -0000 1.1
636 +++ hb-install-x86+amd64-kernel.xml 2 Aug 2006 21:15:52 -0000 1.2
637 @@ -4,12 +4,12 @@
638 <!-- The content of this document is licensed under the CC-BY-SA license -->
639 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
640
641 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml,v 1.1 2006/08/02 21:15:02 neysx Exp $ -->
642 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-kernel.xml,v 1.2 2006/08/02 21:15:52 neysx Exp $ -->
643
644 <sections>
645
646 -<version>3.13</version>
647 -<date>2006-07-20</date>
648 +<version>3.14</version>
649 +<date>2006-07-26</date>
650
651 <section>
652 <title>Timezone</title>
653 @@ -45,13 +45,19 @@
654 Guide</uri>.
655 </p>
656
657 -<p>
658 +<p test="func:keyval('arch')='x86'">
659 For x86-based systems we have, amongst other kernels, <c>vanilla-sources</c>
660 (the default kernel source as developed by the linux-kernel developers),
661 <c>gentoo-sources</c> (kernel source patched with performance-enhancing
662 features), ...
663 </p>
664
665 +<p test="func:keyval('arch')='AMD64'">
666 +For AMD64-based systems we have <c>gentoo-sources</c> (kernel v2.6 source
667 +patched with amd64 specific fixes for stability, performance and hardware
668 +support).
669 +</p>
670 +
671 <p>
672 Choose your kernel source and install it using <c>emerge</c>. The
673 <c>USE="-doc"</c> is necessary to avoid installing xorg-x11 or other
674 @@ -67,20 +73,20 @@
675 <p>
676 When you take a look in <path>/usr/src</path> you should see a symlink called
677 <path>linux</path> pointing to your kernel source. In this case, the installed
678 -kernel source points to <c>gentoo-sources-2.6.12-r10</c>. Your version may be
679 -different, so keep this in mind.
680 +kernel source points to <c>gentoo-sources-<keyval id="kernel-version"/></c>.
681 +Your version may be different, so keep this in mind.
682 </p>
683
684 <pre caption="Viewing the kernel source symlink">
685 # <i>ls -l /usr/src/linux</i>
686 -lrwxrwxrwx 1 root root 12 Oct 13 11:04 /usr/src/linux -&gt; linux-2.6.12-gentoo-r10
687 +lrwxrwxrwx 1 root root 12 Oct 13 11:04 /usr/src/linux -&gt; linux-<keyval id="kernel-version"/>
688 </pre>
689
690 <p>
691 -Now it is time to configure and compile your kernel source. You
692 -can use <c>genkernel</c> for this, which will build a generic kernel as used
693 -by the Installation CD. We explain the "manual" configuration first though, as
694 -it is the best way to optimize your environment.
695 +Now it is time to configure and compile your kernel source. You can use
696 +<c>genkernel</c> for this, which will build a generic kernel as used by the
697 +Installation CD. We explain the "manual" configuration first though, as it is
698 +the best way to optimize your environment.
699 </p>
700
701 <p>
702 @@ -144,7 +150,7 @@
703 You need this, otherwise some very important code/drivers won't show up:
704 </p>
705
706 -<pre caption="Selecting experimental code/drivers, General setup">
707 +<pre caption="Selecting experimental code/drivers">
708 Code maturity level options ---&gt;
709 [*] Prompt for development and/or incomplete code/drivers
710 </pre>
711 @@ -155,6 +161,30 @@
712 otherwise your system will not be able to boot completely.
713 </p>
714
715 +</body>
716 +<body test="func:keyval('arch')='AMD64'">
717 +
718 +<p>
719 +We shall then select the exact processor type. The x86_64 kernel maintainer
720 +strongly recommends users enable MCE features so that they are able to be
721 +notified of any hardware problems. On x86_64, these errors are not printed to
722 +<c>dmesg</c> like on other architectures, but to <path>/dev/mcelog</path>. This
723 +requires the <c>app-admin/mcelog</c> package.
724 +</p>
725 +
726 +<pre caption="Selecting processor type and features">
727 +Processor type and features --->
728 + [ ] Intel MCE Features
729 + [ ] AMD MCE Features
730 + Processor family (AMD-Opteron/Athlon64) --->
731 + ( ) AMD-Opteron/Athlon64
732 + ( ) Intel EM64T
733 + ( ) Generic-x86-64
734 +</pre>
735 +
736 +</body>
737 +<body test="func:keyval('arch')='x86'">
738 +
739 <p>
740 Now select the correct processor family:
741 </p>
742 @@ -165,11 +195,21 @@
743 (<i>Athlon/Duron/K7</i>) Processor family
744 </pre>
745
746 +</body>
747 +<body>
748 +
749 <p>
750 Now go to <c>File Systems</c> and select support for the filesystems you use.
751 <e>Don't</e> compile them as modules, otherwise your Gentoo system will not be
752 able to mount your partitions. Also select <c>Virtual memory</c> and <c>/proc
753 -file system</c>. If you are using a 2.4 kernel, you need to select <c>/dev file
754 +file system</c>.
755 +</p>
756 +
757 +</body>
758 +<body test="func:keyval('arch')='x86'">
759 +
760 +<p>
761 +If you are using a 2.4 kernel, you need to select <c>/dev file
762 system</c> as 2.4 kernels do not support <c>udev</c>.
763 </p>
764
765 @@ -197,9 +237,9 @@
766 </pre>
767
768 <p>
769 -If your BIOS can't handle large harddrives and you jumpered the harddrive to
770 -report a limited size you have to enable the following option to gain access
771 -to your whole harddrive:
772 +If your BIOS can't handle large hard drives and you jumpered the hard drive to
773 +report a limited size you have to enable the following option to gain access to
774 +your whole hard drive:
775 </p>
776
777 <pre caption="Selecting autogeometry resizing support">
778 @@ -211,6 +251,26 @@
779 [*] Auto-Geometry Resizing support
780 </pre>
781
782 +</body>
783 +<body test="func:keyval('arch')='AMD64'">
784 +
785 +<pre caption="Selecting necessary file systems">
786 +File systems ---&gt;
787 + Pseudo Filesystems ---&gt;
788 + [*] /proc file system support
789 + [*] Virtual memory file system support (former shm fs)
790 +
791 +<comment>(Select one or more of the following options as needed by your system)</comment>
792 + &lt;*&gt; Reiserfs support
793 + &lt;*&gt; Ext3 journalling file system support
794 + &lt;*&gt; JFS filesystem support
795 + &lt;*&gt; Second extended fs support
796 + &lt;*&gt; XFS filesystem support
797 +</pre>
798 +
799 +</body>
800 +<body>
801 +
802 <p>
803 Do not forget to enable DMA for your drives:
804 </p>
805 @@ -227,7 +287,15 @@
806 modem, you will need the following options in the kernel:
807 </p>
808
809 -<pre caption="Selecting PPPoE necessary drivers">
810 +<pre caption="Selecting PPPoE necessary drivers" test="func:keyval('arch')='AMD64'">
811 +Device Drivers ---&gt;
812 + Networking Support ---&gt;
813 + &lt;*&gt; PPP (point-to-point protocol) support
814 + &lt;*&gt; PPP support for async serial ports
815 + &lt;*&gt; PPP support for sync tty ports
816 +</pre>
817 +
818 +<pre caption="Selecting PPPoE necessary drivers" test="func:keyval('arch')='x86'">
819 <comment>(With a 2.4.x kernel)</comment>
820 Network device support ---&gt;
821 &lt;*&gt; PPP (point-to-point protocol) support
822 @@ -253,11 +321,16 @@
823 ethernet card.
824 </p>
825
826 -<p>
827 +<p test="func:keyval('arch')='x86'">
828 If you have an Intel CPU that supports HyperThreading (tm), or you have a
829 multi-CPU system, you should activate "Symmetric multi-processing support":
830 </p>
831
832 +<p test="func:keyval('arch')='AMD64'">
833 +If you have a multi-CPU Opteron or a multi-core (e.g. AMD64 X2) system, you
834 +should activate "Symmetric multi-processing support":
835 +</p>
836 +
837 <pre caption="Activating SMP support">
838 Processor type and features ---&gt;
839 [*] Symmetric multi-processing support
840 @@ -273,10 +346,14 @@
841 </p>
842
843 <pre caption="Activating USB Support for Input Devices">
844 -USB Support ---&gt;
845 - &lt;*&gt; USB Human Interface Device (full HID) support
846 +Device Drivers ---&gt;
847 + USB Support ---&gt;
848 + &lt;*&gt; USB Human Interface Device (full HID) support
849 </pre>
850
851 +</body>
852 +<body test="func:keyval('arch')='x86'">
853 +
854 <p>
855 Laptop-users who want PCMCIA support should <e>not</e> use the PCMCIA drivers if
856 they choose to use a 2.4 kernel. More recent drivers are available through the
857 @@ -321,7 +398,7 @@
858 the configuration and start the compilation process:
859 </p>
860
861 -<pre caption="Compiling the kernel">
862 +<pre caption="Compiling the kernel" test="func:keyval('arch')='x86'">
863 <comment>(For 2.4 kernel)</comment>
864 # <i>make dep &amp;&amp; make bzImage modules modules_install</i>
865
866 @@ -329,16 +406,20 @@
867 # <i>make &amp;&amp; make modules_install</i>
868 </pre>
869
870 +<pre caption="Compiling the kernel" test="func:keyval('arch')='AMD64'">
871 +# <i>make &amp;&amp; make modules_install</i>
872 +</pre>
873 +
874 <p>
875 When the kernel has finished compiling, copy the kernel image to
876 <path>/boot</path>. Use whatever name you feel is appropriate for your kernel
877 choice and remember it as you will need it later on when you configure your
878 -bootloader. Remember to replace <path>&lt;kernel-version&gt;</path> with the name and
879 -version of your kernel.
880 +bootloader. Remember to replace <c><keyval id="kernel-name"/></c> with the
881 +name and version of your kernel.
882 </p>
883
884 <pre caption="Installing the kernel">
885 -# <i>cp arch/i386/boot/bzImage /boot/&lt;kernel-version&gt;</i>
886 +# <i>cp arch/<keyval id="arch-sub"/>/boot/bzImage /boot/<keyval id="kernel-name"/></i>
887 </pre>
888
889 <p>
890 @@ -376,6 +457,9 @@
891 # <i>emerge genkernel</i>
892 </pre>
893
894 +</body>
895 +<body test="func:keyval('arch')='x86'">
896 +
897 <p>
898 Next, if you are going to configure a 2.6 kernel, copy over the kernel
899 configuration used by the Installation CD to the location where genkernel
900 @@ -387,6 +471,9 @@
901 # <i>zcat /proc/config.gz &gt; /usr/share/genkernel/x86/kernel-config-2.6</i>
902 </pre>
903
904 +</body>
905 +<body>
906 +
907 <p>
908 Now, compile your kernel sources by running <c>genkernel all</c>. Be aware
909 though, as <c>genkernel</c> compiles a kernel that supports almost all
910 @@ -439,34 +526,37 @@
911 <title>Configuring the Modules</title>
912 <body>
913
914 +<note test="func:keyval('arch')='x86'">
915 +If you chose a kernel 2.4, replace occurrences of <c>2.6</c> with <c>2.4</c> in
916 +this section.
917 +</note>
918 +
919 <p>
920 -You should list the modules you want automatically loaded in
921 -<path>/etc/modules.autoload.d/kernel-2.4</path> (or <path>kernel-2.6</path>).
922 -You can add extra options to the modules too if you want.
923 +You should list the modules you want automatically loaded in
924 +<path>/etc/modules.autoload.d/kernel-2.6</path>. You can add extra options to
925 +the modules too if you want.
926 </p>
927
928 <p>
929 To view all available modules, run the following <c>find</c> command. Don't
930 -forget to substitute "&lt;kernel version&gt;" with the version of the kernel you
931 -just compiled:
932 +forget to substitute <c><keyval id="kernel-version"/></c> with the version of
933 +the kernel you just compiled:
934 </p>
935
936 <pre caption="Viewing all available modules">
937 -# <i>find /lib/modules/&lt;kernel version&gt;/ -type f -iname '*.o' -or -iname '*.ko'</i>
938 +# <i>find /lib/modules/<keyval id="kernel-version"/>/ -type f -iname '*.o' -or -iname '*.ko'</i>
939 </pre>
940
941 <p>
942 For instance, to automatically load the <c>3c59x.o</c> module, edit the
943 -<path>kernel-2.4</path> or <path>kernel-2.6</path> file and enter the module
944 -name in it.
945 +<path>kernel-2.6</path> file and enter the module name in it.
946 </p>
947
948 -<pre caption="Editing /etc/modules.autoload.d/kernel-2.4">
949 -<comment>(Example for 2.4 kernels)</comment>
950 -# <i>nano -w /etc/modules.autoload.d/kernel-2.4</i>
951 +<pre caption="Editing /etc/modules.autoload.d/kernel-2.6">
952 +# <i>nano -w /etc/modules.autoload.d/kernel-2.6</i>
953 </pre>
954
955 -<pre caption="/etc/modules.autoload.d/kernel-2.4 or kernel-2.6">
956 +<pre caption="/etc/modules.autoload.d/kernel-2.6">
957 3c59x
958 </pre>
959
960
961
962
963 1.2 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml
964
965 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?rev=1.2&view=markup
966 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?rev=1.2&content-type=text/plain
967 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml?r1=1.1&r2=1.2
968
969 Index: hb-install-x86+amd64-medium.xml
970 ===================================================================
971 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml,v
972 retrieving revision 1.1
973 retrieving revision 1.2
974 diff -u -r1.1 -r1.2
975 --- hb-install-x86+amd64-medium.xml 2 Aug 2006 21:15:02 -0000 1.1
976 +++ hb-install-x86+amd64-medium.xml 2 Aug 2006 21:15:52 -0000 1.2
977 @@ -4,12 +4,12 @@
978 <!-- The content of this document is licensed under the CC-BY-SA license -->
979 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
980
981 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml,v 1.1 2006/08/02 21:15:02 neysx Exp $ -->
982 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-medium.xml,v 1.2 2006/08/02 21:15:52 neysx Exp $ -->
983
984 <sections>
985
986 -<version>2.11</version>
987 -<date>2006-07-19</date>
988 +<version>2.12</version>
989 +<date>2006-07-26</date>
990
991 <section>
992 <title>Hardware Requirements</title>
993 @@ -26,7 +26,7 @@
994 </subsection>
995 <subsection>
996 <title>Hardware Requirements</title>
997 -<body>
998 +<body test="func:keyval('arch')='x86'">
999
1000 <table>
1001 <tr>
1002 @@ -55,6 +55,33 @@
1003 </table>
1004
1005 </body>
1006 +<body test="func:keyval('arch')='AMD64'">
1007 +
1008 +<table>
1009 +<tr>
1010 + <th>CPU</th>
1011 + <ti>Any AMD64 CPU</ti>
1012 +</tr>
1013 +<tr>
1014 + <th>Memory</th>
1015 + <ti>64 MB</ti>
1016 +</tr>
1017 +<tr>
1018 + <th>Diskspace</th>
1019 + <ti>1.5 GB (excluding swap space)</ti>
1020 +</tr>
1021 +<tr>
1022 + <th>Swap space</th>
1023 + <ti>At least 256 MB</ti>
1024 +</tr>
1025 +</table>
1026 +
1027 +<p>
1028 +You should check the <uri link="/proj/en/base/amd64/">Gentoo
1029 +AMD64 Project Page</uri> before proceeding.
1030 +</p>
1031 +
1032 +</body>
1033 </subsection>
1034 </section>
1035 <!-- This part can be propagated to the other architectures as well. -->
1036 @@ -80,15 +107,21 @@
1037 latest version of the available packages.
1038 </p>
1039
1040 -<impo>
1041 +<impo test="func:keyval('arch')='x86'">
1042 If you wish to install Gentoo without a working Internet connection or would
1043 like to use one of the provided installers, please use the installation
1044 -instructions described in the <uri link="2006.0/index.xml">Gentoo 2006.0
1045 +instructions described in the <uri link="2006.0/">Gentoo 2006.0
1046 Handbooks</uri>.
1047 </impo>
1048
1049 +<impo test="func:keyval('arch')='AMD64'">
1050 +If you wish to install Gentoo without a working Internet connection, please use
1051 +the installation instructions described in the <uri link="2006.0/">Gentoo
1052 +2006.0 Handbooks</uri>.
1053 +</impo>
1054 +
1055 <p>
1056 -The two Installation CDs that we currently provide are:
1057 +The Installation CDs that we currently provide are:
1058 </p>
1059
1060 <ul>
1061 @@ -97,12 +130,17 @@
1062 CD which sole purpose is to boot the system, prepare the networking and
1063 continue with the Gentoo installation.
1064 </li>
1065 - <li>
1066 + <li test="func:keyval('arch')='x86'">
1067 The Gentoo <e>Installer LiveCD</e> contains everything you need to install
1068 Gentoo. It provides a graphical environment, a graphical as well as console
1069 based installer which automatically carries out the installation for you,
1070 and of course, the installation instructions for your architecture.
1071 </li>
1072 + <li test="func:keyval('arch')='AMD64'">
1073 + The Gentoo <e>Universal</e> Installation CD, a bootable CD with the same
1074 + abilities as the Minimal Installation CD. Additionally, it contains the
1075 + stage3 tarball.
1076 + </li>
1077 </ul>
1078
1079 <p>
1080 @@ -113,13 +151,14 @@
1081 </body>
1082 </subsection>
1083 <subsection>
1084 -<title>Gentoo's Minimal Installation CD</title>
1085 +<title>Gentoo Minimal Installation CD</title>
1086 <body>
1087
1088 <p>
1089 -The Minimal Installation CD is called <c>install-x86-minimal-2006.0.iso</c>
1090 -and takes up only 49 MB of diskspace. You can use this Installation CD to
1091 -install Gentoo, but always with a working Internet connection only.
1092 +The Minimal Installation CD is called <c><keyval id="min-cd-name"/></c> and
1093 +takes up only <keyval id="min-cd-size"/> MB of diskspace. You can use this
1094 +Installation CD to install Gentoo, but <e>only</e> with a working Internet
1095 +connection.
1096 </p>
1097
1098 <table>
1099 @@ -134,24 +173,24 @@
1100 <tr>
1101 <th>-</th>
1102 <ti>
1103 - Contains no stage3 tarball, no Portage snapshot, no prebuilt packages and is
1104 - therefore not suitable for networkless installation
1105 + Contains no stage3 tarball, no Portage snapshot, no prebuilt packages and
1106 + is therefore not suitable for networkless installation
1107 </ti>
1108 </tr>
1109 </table>
1110
1111 </body>
1112 </subsection>
1113 -<subsection>
1114 -<title>Gentoo's Installer LiveCD</title>
1115 +<subsection test="func:keyval('arch')='x86'">
1116 +<title>Gentoo Installer LiveCD</title>
1117 <body>
1118
1119 <p>
1120 -The Installer LiveCD is called
1121 -<c>livecd-i686-installer-2006.0.iso</c> and takes up 697 MB. You can use
1122 -this Installation CD to install Gentoo, and you can even use it to install
1123 -Gentoo without a working internet connection, just in case you want to bring
1124 -Gentoo to another PC than the one you are currently installing Gentoo on :)
1125 +The Installer LiveCD is called <c><keyval id="live-cd-name"/></c> and takes up
1126 +<keyval id="live-cd-size"/> MB. You can use this Installation CD to install
1127 +Gentoo, and you can even use it to install Gentoo without a working internet
1128 +connection, just in case you want to bring Gentoo to another PC than the one
1129 +you are currently installing Gentoo on.
1130 </p>
1131
1132 <table>
1133 @@ -174,8 +213,39 @@
1134
1135 </body>
1136 </subsection>
1137 -<!-- PackageCDs on x86 are outdated
1138 -<subsection>
1139 +<subsection test="func:keyval('arch')='AMD64'">
1140 +<title>Gentoo Universal Installation CD</title>
1141 +<body>
1142 +
1143 +<p>
1144 +The Universal Installation CD is called <c><keyval id="uni-cd-name"/></c> and
1145 +takes up <keyval id="uni-cd-size"/> MB. You can use this Installation CD to
1146 +install Gentoo, and you can even use it to install Gentoo without a working
1147 +internet connection, just in case you want to bring Gentoo to another PC than
1148 +the one you are currently installing Gentoo on.
1149 +</p>
1150 +
1151 +<table>
1152 +<tr>
1153 + <th>Universal Installation CD</th>
1154 + <th>Pros and Cons</th>
1155 +</tr>
1156 +<tr>
1157 + <th>+</th>
1158 + <ti>
1159 + Contains everything you need. You can even install without a network
1160 + connection.
1161 + </ti>
1162 +</tr>
1163 +<tr>
1164 + <th>-</th>
1165 + <ti>Huge download</ti>
1166 +</tr>
1167 +</table>
1168 +
1169 +</body>
1170 +</subsection>
1171 +<subsection test="func:keyval('arch')='AMD64'">
1172 <title>Other CDs</title>
1173 <body>
1174
1175 @@ -194,16 +264,16 @@
1176 </p>
1177
1178 </body>
1179 -</subsection>-->
1180 +</subsection>
1181 <subsection>
1182 <title>The Stage3 Tarball</title>
1183 <body>
1184
1185 <p>
1186 -A stage3 tarball is an archive containing a minimal Gentoo environment, suitable
1187 -to continue the Gentoo installation using the instructions in this manual.
1188 -Previously, the Gentoo Handbook described the installation using one of three
1189 -stage tarballs. While Gentoo still offers stage1 and stage2 tarballs, the
1190 +A stage3 tarball is an archive containing a minimal Gentoo environment,
1191 +suitable to continue the Gentoo installation using the instructions in this
1192 +manual. Previously, the Gentoo Handbook described the installation using one of
1193 +three stage tarballs. While Gentoo still offers stage1 and stage2 tarballs, the
1194 official installation method uses the stage3 tarball. If you are interested in
1195 performing a Gentoo installation using a stage1 or stage2 tarball, please read
1196 the Gentoo FAQ on <uri link="/doc/en/faq.xml#stage12">How do I Install Gentoo
1197 @@ -211,9 +281,10 @@
1198 </p>
1199
1200 <p>
1201 -Stage3 tarballs can be downloaded from <path>releases/x86/2006.0/stages/</path>
1202 -on any of the <uri link="/main/en/mirrors.xml">Official Gentoo Mirrors</uri>
1203 -and are not provided on the LiveCD.
1204 +Stage3 tarballs can be downloaded from <path><keyval
1205 +id="release-dir"/>stages/</path> on any of the <uri
1206 +link="/main/en/mirrors.xml">Official Gentoo Mirrors</uri> and are not provided
1207 +on the LiveCD.
1208 </p>
1209
1210 </body>
1211 @@ -232,11 +303,17 @@
1212 the several available Installation CDs, but where can you find them?
1213 </p>
1214
1215 -<p>
1216 +<p test="func:keyval('arch')='x86'">
1217 +You can download any of the Installation CDs from one of our <uri
1218 +link="/main/en/mirrors.xml">mirrors</uri>. The Installation CDs are located in
1219 +the <path><keyval id="release-dir"/>installcd/</path> directory.
1220 +</p>
1221 +
1222 +<p test="func:keyval('arch')='AMD64'">
1223 You can download any of the Installation CDs (and, if you want to, a Packages
1224 CD as well) from one of our <uri link="/main/en/mirrors.xml">mirrors</uri>. The
1225 -Installation CDs are located in the <path>releases/x86/2006.0/installcd</path>
1226 -directory.
1227 +Installation CDs are located in the <path><keyval
1228 +id="release-dir"/>installcd/</path> directory.
1229 </p>
1230
1231 <p>
1232 @@ -247,7 +324,7 @@
1233 <p>
1234 In case you wonder if your downloaded file is corrupted or not, you can check
1235 its MD5 checksum and compare it with the MD5 checksum we provide (such as
1236 -<path>install-x86-minimal-2006.0.iso.DIGESTS</path>). You can check the MD5
1237 +<path><keyval id="min-cd-name"/>.DIGESTS</path>). You can check the MD5
1238 checksum with the <c>md5sum</c> tool under Linux/Unix or <uri
1239 link="http://www.etree.org/md5com.html">md5sum</uri> for Windows.
1240 </p>
1241 @@ -296,13 +373,8 @@
1242 <title>Booting the Installation CD</title>
1243 <body>
1244
1245 -<impo>
1246 -Read this whole subsection before continuing, as you will probably not have the
1247 -opportunity to read it before doing things later.
1248 -</impo>
1249 -
1250 <p>
1251 -Once you have burned your installation CD, it is time to boot it.
1252 +Once you have burnt your installation CD, it is time to boot it.
1253 Remove all CDs from your CD drives, reboot your system and enter the BIOS.
1254 This is usually done by hitting DEL, F1 or ESC, depending on your BIOS. Inside
1255 the BIOS, change the boot order so that the CD-ROM is tried before the hard
1256 @@ -311,11 +383,10 @@
1257 </p>
1258
1259 <p>
1260 -Now place the installation CD in the CD-ROM drive (duh) and reboot. You
1261 -should see a boot prompt. At this screen, you can hit Enter to begin the
1262 -boot process with the default boot options, or boot the Installation CD with
1263 -custom boot options by specifying a kernel followed by boot options and then
1264 -hitting Enter.
1265 +Now place the installation CD in the CD-ROM drive and reboot. You should see a
1266 +boot prompt. At this screen, you can hit Enter to begin the boot process with
1267 +the default boot options, or boot the Installation CD with custom boot options
1268 +by specifying a kernel followed by boot options and then hitting Enter.
1269 </p>
1270
1271 <p>
1272 @@ -328,6 +399,9 @@
1273 Below you'll find a short overview on the available kernels:
1274 </p>
1275
1276 +</body>
1277 +<body test="func:keyval('arch')='x86'">
1278 +
1279 <table>
1280 <tr>
1281 <th>Kernel</th>
1282 @@ -347,6 +421,26 @@
1283 </tr>
1284 </table>
1285
1286 +</body>
1287 +<body test="func:keyval('arch')='AMD64'">
1288 +<table>
1289 +<tr>
1290 + <th>Kernel</th>
1291 + <th>Description</th>
1292 +</tr>
1293 +<tr>
1294 + <ti>gentoo</ti>
1295 + <ti>Default kernel with support for K8 CPUs with NUMA</ti>
1296 +</tr>
1297 +<tr>
1298 + <ti>gentoo-nofb</ti>
1299 + <ti>Same as <c>gentoo</c> but without framebuffer support</ti>
1300 +</tr>
1301 +</table>
1302 +
1303 +</body>
1304 +<body>
1305 +
1306 <p>
1307 You can also provide kernel options. They represent optional settings you can
1308 (de)activate at will. The following list is the same as the one you receive
1309 @@ -388,15 +482,15 @@
1310 </pre>
1311
1312 <p>
1313 -You will then be greeted with a boot screen and progress bar. If you are
1314 +You will then be greeted with a boot screen and progress bar. If you are
1315 installing Gentoo on a system with a non-US keyboard, make sure you immediately
1316 -press Alt-F1 to switch to verbose mode and follow the prompt. If no selection is
1317 -made in 10 seconds the default (US keyboard) will be accepted and the boot
1318 +press Alt-F1 to switch to verbose mode and follow the prompt. If no selection
1319 +is made in 10 seconds the default (US keyboard) will be accepted and the boot
1320 process will continue. Once the boot process completes, you will be
1321 -automatically logged in to the &quot;Live&quot; Gentoo Linux as
1322 -&quot;root&quot;, the super user. You should have a root (&quot;#&quot;) prompt
1323 -on the current console and can also switch to other consoles by pressing Alt-F2,
1324 -Alt-F3 and Alt-F4. Get back to the one you started on by pressing Alt-F1.
1325 +automatically logged in to the "Live" Gentoo Linux as "root", the super user.
1326 +You should have a root ("#") prompt on the current console and can also switch
1327 +to other consoles by pressing Alt-F2, Alt-F3 and Alt-F4. Get back to the one
1328 +you started on by pressing Alt-F1.
1329 </p>
1330
1331 <p>
1332 @@ -410,12 +504,12 @@
1333 <body>
1334
1335 <p>
1336 -When the Installation CD boots, it tries to detect all your hardware devices and
1337 -loads the appropriate kernel modules to support your hardware. In the
1338 -vast majority of cases, it does a very good job. However, in some cases
1339 -it may not auto-load the kernel modules you need. If the PCI auto-detection
1340 -missed some of your system's hardware, you will have to load the appropriate
1341 -kernel modules manually.
1342 +When the Installation CD boots, it tries to detect all your hardware devices
1343 +and loads the appropriate kernel modules to support your hardware. In the vast
1344 +majority of cases, it does a very good job. However, in some cases it may not
1345 +auto-load the kernel modules you need. If the PCI auto-detection missed some of
1346 +your system's hardware, you will have to load the appropriate kernel modules
1347 +manually.
1348 </p>
1349
1350 <p>
1351 @@ -459,8 +553,11 @@
1352 </p>
1353
1354 <pre caption="Tweaking hard disk performance">
1355 -<comment>Activate DMA:</comment> # <i>hdparm -d 1 /dev/hda</i>
1356 -<comment>Activate Safe Performance Options:</comment> # <i>hdparm -d 1 -A 1 -m 16 -u 1 -a 64 /dev/hda</i>
1357 +<comment>(Activate DMA:)</comment>
1358 +# <i>hdparm -d 1 /dev/hda</i>
1359 +
1360 +<comment>(Activate Safe Performance Options:)</comment>
1361 +# <i>hdparm -d 1 -A 1 -m 16 -u 1 -a 64 /dev/hda</i>
1362 </pre>
1363
1364 </body>
1365 @@ -489,7 +586,7 @@
1366 <p>
1367 To create a user account, we first enter their credentials, followed by
1368 its password. We use <c>useradd</c> and <c>passwd</c> for these tasks.
1369 -In the next example, we create a user called &quot;john&quot;.
1370 +In the next example, we create a user called "john".
1371 </p>
1372
1373 <pre caption="Creating a user account">
1374 @@ -539,7 +636,7 @@
1375 </p>
1376
1377 <pre caption="Viewing the Online Documentation">
1378 -# <i>links http://www.gentoo.org/doc/en/handbook/handbook-x86.xml</i>
1379 +# <i>links http://www.gentoo.org/doc/en/handbook/<keyval id="online-book"/></i>
1380 </pre>
1381
1382 <p>
1383
1384
1385
1386 --
1387 gentoo-doc-cvs@g.o mailing list