Gentoo Archives: gentoo-doc-cvs

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: openrc-migration.xml
Date: Thu, 13 Jan 2011 04:04:20
Message-Id: 20110113033413.86A4F2004E@flycatcher.gentoo.org
1 robbat2 11/01/13 03:34:13
2
3 Modified: openrc-migration.xml
4 Log:
5 Fix the conf.d/modules example which implied loading was cumulative, while the documentation correctly said it was not. Reported by WilliamH.
6
7 Revision Changes Path
8 1.21 xml/htdocs/doc/en/openrc-migration.xml
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/openrc-migration.xml?rev=1.21&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/openrc-migration.xml?rev=1.21&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/openrc-migration.xml?r1=1.20&r2=1.21
13
14 Index: openrc-migration.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/openrc-migration.xml,v
17 retrieving revision 1.20
18 retrieving revision 1.21
19 diff -p -w -b -B -u -u -r1.20 -r1.21
20 --- openrc-migration.xml 13 Jan 2011 03:19:01 -0000 1.20
21 +++ openrc-migration.xml 13 Jan 2011 03:34:13 -0000 1.21
22 @@ -1,6 +1,6 @@
23 <?xml version='1.0' encoding='UTF-8'?>
24 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
25 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/openrc-migration.xml,v 1.20 2011/01/13 03:19:01 robbat2 Exp $ -->
26 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/openrc-migration.xml,v 1.21 2011/01/13 03:34:13 robbat2 Exp $ -->
27
28 <guide link="/doc/en/openrc-migration.xml">
29 <title>Baselayout and OpenRC Migration Guide</title>
30 @@ -167,19 +167,28 @@ to 2.6.x series kernels. The new configu
31 control over the modules and parameters based on kernel version.
32 </p>
33
34 +<impo>
35 +The <b>module*</b> variables are not cumulative. The more version-specific
36 +variables will override the more general variables.
37 +</impo>
38 +
39 +<note>
40 +Please note the difference between <b>module_</b> and <b>modules_</b>.
41 +</note>
42 +
43 <p>
44 An in-depth example would be:
45 </p>
46
47 <pre caption="detailed example of /etc/conf.d/modules">
48 -<comment># Always load ochi1394 and ieee1394, no matter the kernel version</comment>
49 -modules="ohci1394 ieee1394"
50 -<comment># Only load tun and usbserial for 2.6.x series kernels</comment>
51 -modules_2_6="tun usbserial"
52 -<comment># Only load cx88_dvb for 2.6.23 kernels</comment>
53 -modules_2_6_23="cx88_dvb"
54 <comment># Only load ivtv for 2.6.23-gentoo-r5</comment>
55 modules_2_6_23_gentoo_r5="ivtv"
56 +<comment># Only load cx88_dvb for 2.6.23 kernels (other than -gentoo-r5)</comment>
57 +modules_2_6_23="cx88_dvb"
58 +<comment># Only load tun and usbserial for 2.6.x series kernels where x != 23</comment>
59 +modules_2_6="tun usbserial"
60 +<comment># Otherwise load ochi1394 and ieee1394</comment>
61 +modules="ohci1394 ieee1394"
62
63 <comment># For 2.6.23-gentoo-r5, pass video_br=2 to cx88_dvb</comment>
64 module_cx88_dvb_args_2_6_23_gentoo_r5="video_br=2"
65 @@ -189,15 +198,6 @@ module_usbserial_args_2_6="vendor=0x1410
66 module_ieee1394_args="debug"
67 </pre>
68
69 -<impo>
70 -The <b>module*</b> variables are not cumulative. The more version-specific
71 -variables will override the more general variables.
72 -</impo>
73 -
74 -<note>
75 -Please note the difference between <b>module_</b> and <b>modules_</b>.
76 -</note>
77 -
78 </body>
79 </section>
80 <section id="boot">