robbat2 11/01/13 03:34:13 Modified: openrc-migration.xml Log: Fix the conf.d/modules example which implied loading was cumulative, while the documentation correctly said it was not. Reported by WilliamH.
Revision Changes Path 1.21 xml/htdocs/doc/en/openrc-migration.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/openrc-migration.xml?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/openrc-migration.xml?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/openrc-migration.xml?r1=1.20&r2=1.21 Index: openrc-migration.xml =================================================================== RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/openrc-migration.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -p -w -b -B -u -u -r1.20 -r1.21 --- openrc-migration.xml 13 Jan 2011 03:19:01 -0000 1.20 +++ openrc-migration.xml 13 Jan 2011 03:34:13 -0000 1.21 @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/openrc-migration.xml,v 1.20 2011/01/13 03:19:01 robbat2 Exp $ --> +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/openrc-migration.xml,v 1.21 2011/01/13 03:34:13 robbat2 Exp $ --> <guide link="/doc/en/openrc-migration.xml"> <title>Baselayout and OpenRC Migration Guide</title> @@ -167,19 +167,28 @@ to 2.6.x series kernels. The new configu control over the modules and parameters based on kernel version. </p> +<impo> +The <b>module*</b> variables are not cumulative. The more version-specific +variables will override the more general variables. +</impo> + +<note> +Please note the difference between <b>module_</b> and <b>modules_</b>. +</note> + <p> An in-depth example would be: </p> <pre caption="detailed example of /etc/conf.d/modules"> -<comment># Always load ochi1394 and ieee1394, no matter the kernel version</comment> -modules="ohci1394 ieee1394" -<comment># Only load tun and usbserial for 2.6.x series kernels</comment> -modules_2_6="tun usbserial" -<comment># Only load cx88_dvb for 2.6.23 kernels</comment> -modules_2_6_23="cx88_dvb" <comment># Only load ivtv for 2.6.23-gentoo-r5</comment> modules_2_6_23_gentoo_r5="ivtv" +<comment># Only load cx88_dvb for 2.6.23 kernels (other than -gentoo-r5)</comment> +modules_2_6_23="cx88_dvb" +<comment># Only load tun and usbserial for 2.6.x series kernels where x != 23</comment> +modules_2_6="tun usbserial" +<comment># Otherwise load ochi1394 and ieee1394</comment> +modules="ohci1394 ieee1394" <comment># For 2.6.23-gentoo-r5, pass video_br=2 to cx88_dvb</comment> module_cx88_dvb_args_2_6_23_gentoo_r5="video_br=2" @@ -189,15 +198,6 @@ module_usbserial_args_2_6="vendor=0x1410 module_ieee1394_args="debug" </pre> -<impo> -The <b>module*</b> variables are not cumulative. The more version-specific -variables will override the more general variables. -</impo> - -<note> -Please note the difference between <b>module_</b> and <b>modules_</b>. -</note> - </body> </section> <section id="boot">
