Gentoo Archives: gentoo-doc-cvs

From: Josh Saddler <nightmorph@××××××××××××.org>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] cvs commit: hb-install-config.xml hb-install-finalise.xml hb-install-stage.xml
Date: Sat, 31 Mar 2007 04:37:14
Message-Id: E1HXVKf-0002Rz-Ux@stork.gentoo.org
1 nightmorph 07/03/31 04:36:53
2
3 Modified: hb-install-config.xml hb-install-finalise.xml
4 hb-install-stage.xml
5 Log:
6 added conditionals to config and stage, now to add them to the rest of the arch handbooks
7
8 Revision Changes Path
9 1.3 xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml?r1=1.2&r2=1.3
14
15 Index: hb-install-config.xml
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- hb-install-config.xml 20 Mar 2007 05:24:48 -0000 1.2
22 +++ hb-install-config.xml 31 Mar 2007 04:36:53 -0000 1.3
23 @@ -4,7 +4,7 @@
24 <!-- The content of this document is licensed under the CC-BY-SA license -->
25 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
26
27 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml,v 1.2 2007/03/20 05:24:48 nightmorph Exp $ -->
28 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml,v 1.3 2007/03/31 04:36:53 nightmorph Exp $ -->
29
30 <sections>
31
32 @@ -67,32 +67,39 @@
33 </li>
34 </ul>
35
36 -<p>
37 +<impo>
38 The default <path>/etc/fstab</path> file provided by Gentoo <e>is not a valid
39 -fstab file</e>, so start <c>nano</c> (or your favorite editor) to create your
40 -<path>/etc/fstab</path>:
41 -</p>
42 +fstab file</e>. You <b>have to create</b> your own <path>/etc/fstab</path>.
43 +</impo>
44
45 <pre caption="Opening /etc/fstab">
46 # <i>nano -w /etc/fstab</i>
47 </pre>
48
49 +</body>
50 +<body test="func:keyval('/boot')">
51 +
52 <p>
53 Let us take a look at how we write down the options for the <path>/boot</path>
54 -partition. If your architecture doesn't require a seperate <path>/boot</path>
55 -partition (such as Apple PowerPC machines) or you have elected not to create
56 -one, don't include a boot line in your fstab. The Apple Bootstrap partition
57 -is not a <path>/boot</path> partition.
58 +partition. This is just an example, if you didn't or couldn't create a
59 +<path>/boot</path>, don't copy it.
60 </p>
61
62 -<p>
63 -In our default x86 partitioning example <path>/boot</path> is the
64 -<path>/dev/hda1</path> partition, with <c>ext2</c> as filesystem.
65 -It needs to be checked during boot, so we would write down:
66 +<p test="contains(func:keyval('/boot'), '/dev/hd')">
67 +In our default <keyval id="arch"/> partitioning example, <path>/boot</path> is
68 +usually the <path><keyval id="/boot"/></path> partition (or
69 +<path>/dev/sda*</path> if you use SCSI or SATA drives), with <c>ext2</c> as
70 +filesystem. It needs to be checked during boot, so we would write down:
71 +</p>
72 +
73 +<p test="contains(func:keyval('/boot'), '/dev/sd')">
74 +In our default <keyval id="arch"/> partitioning example, <path>/boot</path> is
75 +usually the <path><keyval id="/boot"/></path> partition, with <c>ext2</c> as
76 +filesystem. It needs to be checked during boot, so we would write down:
77 </p>
78
79 <pre caption="An example /boot line for /etc/fstab">
80 -/dev/hda1 /boot ext2 defaults 1 2
81 +<keyval id="/boot"/> /boot ext2 defaults 1 2
82 </pre>
83
84 <p>
85 @@ -102,42 +109,95 @@
86 manually mount this partition every time you want to use it.
87 </p>
88
89 -<p>
90 -Now, to improve performance, most users would want to add the <c>noatime</c>
91 -option as mountoption, which results in a faster system since access times
92 -aren't registered (you don't need those generally anyway):
93 +</body>
94 +<body>
95 +
96 +<p test="not(func:keyval('arch')='SPARC')">
97 +Add the rules that match your partitioning scheme and append rules for
98 +<path>/proc</path>, <c>tmpfs</c>, for your CD-ROM drive(s), and of course, if
99 +you have other partitions or drives, for those too.
100 </p>
101
102 -<pre caption="An improved /boot line for /etc/fstab">
103 -/dev/hda1 /boot ext2 defaults,noatime 1 2
104 -</pre>
105 +<p test="func:keyval('arch')='SPARC'">
106 +Add the rules that match your partitioning schema and append rules for
107 +<path>/proc/openprom</path>, <path>/proc</path>, <c>tmpfs</c> , for your CD-ROM
108 +drive(s), and of course, if you have other partitions or drives, for those too.
109 +</p>
110
111 <p>
112 -If we continue with this, we would end up with the following three lines (for
113 -<path>/boot</path>, <path>/</path> and the swap partition):
114 +Now use the <e>example</e> below to create your <path>/etc/fstab</path>:
115 </p>
116
117 -<pre caption="Three /etc/fstab lines">
118 -/dev/hda1 /boot ext2 defaults,noatime 1 2
119 -/dev/hda2 none swap sw 0 0
120 -/dev/hda3 / ext3 noatime 0 1
121 +<pre caption="A full /etc/fstab example" test="func:keyval('arch')='AMD64' or func:keyval('arch')='x86'">
122 +<keyval id="/boot"/> /boot ext2 defaults,noatime 1 2
123 +/dev/hda2 none swap sw 0 0
124 +/dev/hda3 / ext3 noatime 0 1
125 +
126 +proc /proc proc nodev,nosuid,noexec 0 0
127 +shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
128 +
129 +/dev/cdrom /mnt/cdrom auto noauto,user 0 0
130 </pre>
131
132 -<p>
133 -To finish up, you should add a rule for <path>/proc</path>, <c>tmpfs</c>
134 -(required) and for your CD-ROM drive (and of course, if you have other
135 -partitions or drives, for those too):
136 -</p>
137 +<pre caption="A full /etc/fstab example" test="func:keyval('arch')='HPPA'">
138 +<keyval id="/boot"/> /boot ext2 defaults,noatime 1 2
139 +/dev/sda3 none swap sw 0 0
140 +/dev/sda4 / ext3 noatime 0 1
141 +
142 +proc /proc proc nodev,nosuid,noexec 0 0
143 +shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
144 +
145 +/dev/cdrom /mnt/cdrom auto noauto,user 0 0
146 +</pre>
147 +
148 +<pre caption="A full /etc/fstab example" test="func:keyval('arch')='Alpha' or func:keyval('arch')='MIPS'">
149 +<keyval id="/boot"/> /boot ext2 defaults,noatime 1 2
150 +/dev/sda2 none swap sw 0 0
151 +/dev/sda3 / ext3 noatime 0 1
152 +
153 +proc /proc proc nodev,nosuid,noexec 0 0
154 +shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
155 +
156 +/dev/cdrom /mnt/cdrom auto noauto,user 0 0
157 +</pre>
158
159 -<pre caption="A full /etc/fstab example">
160 -/dev/hda1 /boot ext2 defaults,noatime 1 2
161 -/dev/hda2 none swap sw 0 0
162 -/dev/hda3 / ext3 noatime 0 1
163 +<pre caption="A full /etc/fstab example" test="func:keyval('arch')='SPARC'">
164 +/dev/sda1 / ext3 noatime 0 1
165 +/dev/sda2 none swap sw 0 0
166 +/dev/sda4 /usr ext3 noatime 0 2
167 +/dev/sda5 /var ext3 noatime 0 2
168 +/dev/sda6 /home ext3 noatime 0 2
169
170 -proc /proc proc nodev,nosuid,noexec 0 0
171 -shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
172 +openprom /proc/openprom openpromfs defaults 0 0
173 +proc /proc proc nodev,nosuid,noexec 0 0
174 +shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
175
176 -/dev/cdroms/cdrom0 /mnt/cdrom auto noauto,user 0 0
177 +/dev/cdrom /mnt/cdrom auto noauto,user 0 0
178 +</pre>
179 +
180 +<note test="func:keyval('arch')='PPC'">
181 +There are important variations between PPC machine types. Please make sure you
182 +adapt the following example to your system.
183 +</note>
184 +
185 +<pre caption="A full /etc/fstab example" test="func:keyval('arch')='PPC'">
186 +/dev/hda4 / ext3 noatime 0 1
187 +/dev/hda3 none swap sw 0 0
188 +
189 +proc /proc proc nodev,nosuid,noexec 0 0
190 +shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
191 +
192 +/dev/cdrom /mnt/cdrom auto noauto,user 0 0
193 +</pre>
194 +
195 +<pre caption="A full /etc/fstab example" test="func:keyval('arch')='PPC64'">
196 +/dev/sda4 / ext3 noatime 0 1
197 +/dev/sda3 none swap sw 0 0
198 +
199 +proc /proc proc nodev,nosuid,noexec 0 0
200 +shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
201 +
202 +/dev/cdrom /mnt/cdrom auto noauto,user 0 0
203 </pre>
204
205 <p>
206 @@ -147,16 +207,11 @@
207 </p>
208
209 <p>
210 -Now use the above example to create your <path>/etc/fstab</path>. If you are a
211 -<b>SPARC</b>-user, you should add the following line to your
212 -<path>/etc/fstab</path>
213 -too:
214 +To improve performance, most users would want to add the <c>noatime</c>
215 +mount option, which results in a faster system since access times
216 +aren't registered (you don't need those generally anyway).
217 </p>
218
219 -<pre caption="Adding openprom filesystem to /etc/fstab">
220 -openprom /proc/openprom openpromfs defaults 0 0
221 -</pre>
222 -
223 <p>
224 Double-check your <path>/etc/fstab</path>, save and quit to continue.
225 </p>
226 @@ -373,15 +428,15 @@
227 Save and exit the editor to continue.
228 </p>
229
230 -<p>
231 +<p test="func:keyval('arch')='AMD64' or func:keyval('arch')='x86' or substring(func:keyval('arch'),1,3)='PPC'">
232 If you don't have PCMCIA, you can now continue with <uri
233 -link="#doc_chap3">System Information</uri>. PCMCIA-users should read the
234 +link="#sysinfo">System Information</uri>. PCMCIA-users should read the
235 following topic on PCMCIA.
236 </p>
237
238 </body>
239 </subsection>
240 -<subsection>
241 +<subsection test="func:keyval('arch')='AMD64' or func:keyval('arch')='x86' or substring(func:keyval('arch'),1,3)='PPC'">
242 <title>Optional: Get PCMCIA Working</title>
243 <body>
244
245
246
247
248 1.2 xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml
249
250 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml?rev=1.2&view=markup
251 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml?rev=1.2&content-type=text/plain
252 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml?r1=1.1&r2=1.2
253
254 Index: hb-install-finalise.xml
255 ===================================================================
256 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml,v
257 retrieving revision 1.1
258 retrieving revision 1.2
259 diff -u -r1.1 -r1.2
260 --- hb-install-finalise.xml 19 Mar 2007 20:37:28 -0000 1.1
261 +++ hb-install-finalise.xml 31 Mar 2007 04:36:53 -0000 1.2
262 @@ -4,11 +4,11 @@
263 <!-- The content of this document is licensed under the CC-BY-SA license -->
264 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
265
266 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml,v 1.1 2007/03/19 20:37:28 nightmorph Exp $ -->
267 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml,v 1.2 2007/03/31 04:36:53 nightmorph Exp $ -->
268
269 <sections>
270
271 -<version>7.0</version>
272 +<version>8.0</version>
273 <date>2006-08-30</date>
274
275 <section>
276
277
278
279 1.6 xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml
280
281 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml?rev=1.6&view=markup
282 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml?rev=1.6&content-type=text/plain
283 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml?r1=1.5&r2=1.6
284
285 Index: hb-install-stage.xml
286 ===================================================================
287 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml,v
288 retrieving revision 1.5
289 retrieving revision 1.6
290 diff -u -r1.5 -r1.6
291 --- hb-install-stage.xml 30 Mar 2007 12:01:19 -0000 1.5
292 +++ hb-install-stage.xml 31 Mar 2007 04:36:53 -0000 1.6
293 @@ -4,11 +4,11 @@
294 <!-- The content of this document is licensed under the CC-BY-SA license -->
295 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
296
297 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml,v 1.5 2007/03/30 12:01:19 neysx Exp $ -->
298 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml,v 1.6 2007/03/31 04:36:53 nightmorph Exp $ -->
299
300 <sections>
301
302 -<version>7.1</version>
303 +<version>8.0</version>
304 <date>2007-01-31</date>
305
306 <section>
307 @@ -45,19 +45,6 @@
308
309 </body>
310 </subsection>
311 -<subsection>
312 -<title>Locating the Stage3 File</title>
313 -<body>
314 -
315 -<p>
316 -If you have configured networking because you need to download a stage3 file for
317 -your architecture, continue with <uri link="#download">Alternative: Using a
318 -Stage3 from the Internet</uri>. Otherwise read <uri link="#available">Default:
319 -Using a Stage3 from the Installation CD</uri>.
320 -</p>
321 -
322 -</body>
323 -</subsection>
324 </section>
325 <section id="available">
326 <title>Default: Using a Stage from the Installation CD</title>
327 @@ -95,18 +82,18 @@
328
329 <p>
330 We will now extract the stage tarball of your choice. We will do this with the
331 -<c>tar</c> tool. Make sure you use the same options (<c>xvjpf</c>)! The
332 -<c>x</c> stands for <e>Extract</e>, the <c>v</c> for <e>Verbose</e> to see what
333 -happens during the extraction process (this one is optional), the <c>j</c> for
334 +<c>tar</c> tool. Make sure you use the same options (<c>xvjpf</c>)! The <c>x</c>
335 +stands for <e>Extract</e>, the <c>v</c> for <e>Verbose</e> to see what happens
336 +during the extraction process (this one is optional), the <c>j</c> for
337 <e>Decompress with bzip2</e>, the <c>p</c> for <e>Preserve permissions</e> and
338 the <c>f</c> to denote that we want to extract a file, not standard input. In
339 -the next example, we extract the stage tarball
340 -<path>stage3-&lt;subarch&gt;-2007.0.tar.bz2</path>. Be sure to substitute
341 -the tarball filename with your stage.
342 +the next example, we extract the stage tarball <path><keyval
343 +id="stage3"/></path>. Be sure to substitute the tarball filename with your
344 +stage.
345 </p>
346
347 <pre caption="Extracting the stage tarball">
348 -# <i>tar xvjpf /mnt/cdrom/stages/stage3-&lt;subarch&gt;-2007.0.tar.bz2</i>
349 +# <i>tar xvjpf /mnt/cdrom/stages/<keyval id="stage3"/></i>
350 </pre>
351
352 <p>
353 @@ -116,78 +103,6 @@
354
355 </body>
356 </subsection>
357 -</section>
358 -<section id="download">
359 -<title>Alternative: Using a Stage from the Internet</title>
360 -<subsection>
361 -<title>Downloading the Stage Tarball</title>
362 -<body>
363 -
364 -<p>
365 -Go to the Gentoo mountpoint at which you mounted your filesystems
366 -(most likely <path>/mnt/gentoo</path>):
367 -</p>
368 -
369 -<pre caption="Going to the Gentoo mountpoint">
370 -# <i>cd /mnt/gentoo</i>
371 -</pre>
372 -
373 -<p>
374 -Depending on your installation medium, you have a couple of tools available to
375 -download a stage. If you have <c>links</c> available, then you can immediately
376 -surf to <uri link="/main/en/mirrors.xml">the Gentoo mirrorlist</uri> and
377 -choose a mirror close to you.
378 -</p>
379 -
380 -<p>
381 -If you don't have <c>links</c> available you should have <c>lynx</c> at your
382 -disposal. If you need to go through a proxy, export the <c>http_proxy</c> and
383 -<c>ftp_proxy</c> variables:
384 -</p>
385 -
386 -<pre caption="Setting proxy information for lynx">
387 -# <i>export http_proxy="http://proxy.server.com:port"</i>
388 -# <i>export ftp_proxy="http://proxy.server.com:port"</i>
389 -</pre>
390 -
391 -<p>
392 -We will now assume that you have <c>links</c> at your disposal.
393 -</p>
394 -
395 -<p>
396 -Pick the <path>releases/</path> directory, followed by your architecture (for
397 -instance <path>x86/</path>) and the Gentoo version (<path>2007.0/</path>) to
398 -finish up with the <path>stages/</path> directory. There you should see all
399 -available stage files for your architecture (they might be stored within
400 -subdirectories named to the individual subarchitectures). Select one and press
401 -<c>D</c> to download. When you're finished, press <c>Q</c> to quit the browser.
402 -</p>
403 -
404 -<pre caption="Surfing to the mirror listing with links">
405 -# <i>links http://www.gentoo.org/main/en/mirrors.xml</i>
406 -
407 -<comment>(If you need proxy support with links:)</comment>
408 -# <i>links -http-proxy proxy.server.com:8080 http://www.gentoo.org/main/en/mirrors.xml</i>
409 -</pre>
410 -
411 -<p>
412 -Make sure you download a stage3 tarball - installations using a stage1 or stage2
413 -tarball are not supported anymore.
414 -</p>
415 -
416 -<p>
417 -If you want to check the integrity of the downloaded stage tarball, use
418 -<c>md5sum</c> and compare the output with the MD5 checksum provided on the
419 -mirror. For instance, to check the validity of the x86 stage tarball:
420 -</p>
421 -
422 -<pre caption="Example checking integrity of a stage tarball">
423 -# <i>md5sum -c stage3-x86-2007.0.tar.bz2.DIGESTS</i>
424 -stage3-x86-2007.0.tar.bz2: OK
425 -</pre>
426 -
427 -</body>
428 -</subsection>
429 <subsection>
430 <title>Unpacking the Stage Tarball</title>
431 <body>
432 @@ -361,30 +276,24 @@
433 </p>
434
435 <p>
436 -As an example, on the x86 architecture, you will want to set the -march= flag
437 -as shown below (for an Athlon XP machine):
438 +A first setting is the <c>-march=</c> or <c>-mcpu=</c> flag, which specifies
439 +the name of the target architecture. Possible options are described in the
440 +<path>make.conf.example</path> file (as comments).
441 </p>
442
443 -<pre caption="The GCC march setting">
444 --march=athlon-xp
445 -</pre>
446 -
447 <p>
448 A second one is the <c>-O</c> flag (that is a capital O, not a zero),
449 which specifies the <c>gcc</c> optimization
450 class flag. Possible classes are <c>s</c> (for size-optimized),
451 <c>0</c> (zero - for no optimizations), <c>1</c>, <c>2</c> or <c>3</c> for more
452 speed-optimization flags (every class has the same flags as the one before, plus
453 -some extras). For instance, for a class-2 optimization:
454 +some extras). <c>-O2</c> is the recommended default.
455 </p>
456
457 -<pre caption="The GCC O setting">
458 --O2
459 -</pre>
460 -
461 <p>
462 Another popular optimization flag is <c>-pipe</c> (use pipes rather than
463 temporary files for communication between the various stages of compilation).
464 +It has no impact on the generated code.
465 </p>
466
467 <p>
468 @@ -395,12 +304,20 @@
469
470 <p>
471 When you define the <c>CFLAGS</c> and <c>CXXFLAGS</c>, you should combine
472 -several optimization flags, like in the following example:
473 +several optimization flags. The default values contained in the stage3 archive
474 +you unpacked should be good enough. The following example is just an example:
475 </p>
476
477 -<pre caption="Defining the CFLAGS and CXXFLAGS variable">
478 -CFLAGS="-march=athlon-xp -pipe -O2"
479 -CXXFLAGS="${CFLAGS}" <comment># Use the same settings for both variables</comment>
480 +<pre test="not(func:keyval('arch')='AMD64')" caption="Defining the CFLAGS and CXXFLAGS variable">
481 +CFLAGS="<keyval id="CFLAGS"/>"
482 +<comment># Use the same settings for both variables</comment>
483 +CXXFLAGS="${CFLAGS}"
484 +</pre>
485 +
486 +<pre test="func:keyval('arch')='AMD64'" caption="Defining the CFLAGS and CXXFLAGS variable">
487 +CFLAGS="<keyval id="CFLAGS"/>" <comment># EM64T users should use -march=nocona</comment>
488 +<comment># Use the same settings for both variables</comment>
489 +CXXFLAGS="${CFLAGS}"
490 </pre>
491
492 </body>
493
494
495
496 --
497 gentoo-doc-cvs@g.o mailing list