From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PdDx9-0003XF-3R for garchives@archives.gentoo.org; Thu, 13 Jan 2011 03:34:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0B25E074F; Thu, 13 Jan 2011 03:34:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B008FE06DC for ; Thu, 13 Jan 2011 03:34:15 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB5971B4027 for ; Thu, 13 Jan 2011 03:34:14 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 544) id 90B5420057; Thu, 13 Jan 2011 03:34:13 +0000 (UTC) From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo commit in xml/htdocs/doc/en: openrc-migration.xml X-VCS-Repository: gentoo X-VCS-Files: openrc-migration.xml X-VCS-Directories: xml/htdocs/doc/en X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: <20110113033413.90B5420057@flycatcher.gentoo.org> Date: Thu, 13 Jan 2011 03:34:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6b692950-38c5-4873-baf4-bb5578195ffb X-Archives-Hash: ee6b563e1ade375a16a8ca25c5f4585a robbat2 11/01/13 03:34:13 Modified: openrc-migration.xml Log: Fix the conf.d/modules example which implied loading was cumulative, wh= ile 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/open= rc-migration.xml?rev=3D1.21&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/open= rc-migration.xml?rev=3D1.21&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/open= rc-migration.xml?r1=3D1.20&r2=3D1.21 Index: openrc-migration.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 @@ - + =20 Baselayout and OpenRC Migration Guide @@ -167,19 +167,28 @@ to 2.6.x series kernels. The new configu control over the modules and parameters based on kernel version.

=20 + +The module* variables are not cumulative. The more version-specif= ic +variables will override the more general variables. + + + +Please note the difference between module_ and modules_. + +

An in-depth example would be:

=20 
-# Always load ochi1394 and ieee1394, no matter the kernel versi=
on
-modules=3D"ohci1394 ieee1394"
-# Only load tun and usbserial for 2.6.x series kernels
-modules_2_6=3D"tun usbserial"
-# Only load cx88_dvb for 2.6.23 kernels
-modules_2_6_23=3D"cx88_dvb"
 # Only load ivtv for 2.6.23-gentoo-r5
 modules_2_6_23_gentoo_r5=3D"ivtv"
+# Only load cx88_dvb for 2.6.23 kernels (other than -gentoo-r5)=

+modules_2_6_23=3D"cx88_dvb"
+# Only load tun and usbserial for 2.6.x series kernels where x =
!=3D 23
+modules_2_6=3D"tun usbserial"
+# Otherwise load ochi1394 and ieee1394
+modules=3D"ohci1394 ieee1394"
=20
 # For 2.6.23-gentoo-r5, pass video_br=3D2 to cx88_dvb
 module_cx88_dvb_args_2_6_23_gentoo_r5=3D"video_br=3D2"
@@ -189,15 +198,6 @@ module_usbserial_args_2_6=3D"vendor=3D0x1410
 module_ieee1394_args=3D"debug"=20
=20 - -The module* variables are not cumulative. The more version-specif= ic -variables will override the more general variables. - - - -Please note the difference between module_ and modules_. - -