summaryrefslogtreecommitdiff
path: root/conf.d
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2011-07-04 07:48:51 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2011-07-04 07:48:51 +0000
commitbe990b308ae2e7a725852f22f285267dcfeeaa2a (patch)
tree7f3c3e29ed2bdb6120d3a234130c38ce643a553d /conf.d
parent9076baa573a6e7a0ad7fb0de1919b051c8b3b012 (diff)
downloadopenrc-be990b308ae2e7a725852f22f285267dcfeeaa2a.tar.gz
openrc-be990b308ae2e7a725852f22f285267dcfeeaa2a.tar.bz2
openrc-be990b308ae2e7a725852f22f285267dcfeeaa2a.tar.xz
Bug 373808: init.d/modules skipped certain variable combinations
The version iteration code missed certain combinations: KV=1.2.3.4 skips: 1.2.3, 1 KV=1.2.3 skips: 1 Simplify the code to use a loop and build the list of versions directly instead of unique variables per version component. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/modules10
1 files changed, 7 insertions, 3 deletions
diff --git a/conf.d/modules b/conf.d/modules
index c5a3627..a062a62 100644
--- a/conf.d/modules
+++ b/conf.d/modules
@@ -1,8 +1,10 @@
# You can define a list modules for a specific kernel version,
# a released kernel version, a main kernel version or just a list.
+# The most specific versioned variable will take precedence.
#modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
#modules_2_6_23="tun ieee1394"
#modules_2_6="tun"
+#modules_2="ipv6"
#modules="ohci1394"
# You can give modules a different name when they load - the new name
@@ -10,10 +12,12 @@
#modules="dummy:dummy1"
# Give the modules some arguments if needed, per version if necessary.
+# Again, the most specific versioned variable will take precedence.
#module_ieee1394_args="debug"
-#module_ieee1394_args_2_6_23_gentoo_r5="ieee1394 ohci1394"
-#module_ieee1394_args_2_6_23="tun ieee1394"
-#module_ieee1394_args_2_6="tun"
+#module_ieee1394_args_2_6_23_gentoo_r5="debug2"
+#module_ieee1394_args_2_6_23="debug3"
+#module_ieee1394_args_2_6="debug4"
+#module_ieee1394_args_2="debug5"
# You should consult your kernel documentation and configuration
# for a list of modules and their options.