From be990b308ae2e7a725852f22f285267dcfeeaa2a Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 4 Jul 2011 07:48:51 +0000 Subject: 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 --- conf.d/modules | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'conf.d/modules') diff --git a/conf.d/modules b/conf.d/modules index c5a3627c..a062a620 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. -- cgit v1.2.3