SVN: rc-scripts/trunk/rc.d/rc.sysinit

[glen]

Author: glen
Date: Mon Nov 26 21:32:47 2007
New Revision: 9101

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- /etc/rc.d/rc.modules moved to internal functions
- module paramters also accepted from modules file

Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Mon Nov 26 21:32:47 2007
@@ -81,6 +81,29 @@
 	rm -f /etc/mtab.clean
 }
 
+# Loads modules from /etc/modules, /etc/modules.X.Y and /etc/modules.X.Y.Z
+load_kernel_modules() {
+	{
+		local _x _y v _z
+		read  _x _y v _z
+		old_IFS=$IFS
+		IFS='.'
+		set -- $v
+		IFS=$old_IFS
+		kernel="$1.$2"
+		kerneleq="$1.$2.$3"
+	} < /proc/version
+
+	local module
+	# Loop over every line in modules file
+	( \
+		egrep -hv '^(#|[[:blank:]]*$)' /etc/modules /etc/modules.$kernel /etc/modules.$kerneleq 2>/dev/null
+		echo '' # make sure there is a LF at the end
+	) | while read module args; do
+		[ -z "$module" ] && continue
+		modprobe -s $module -- $args
+	done
+}
 
 # boot logging to /var/log/boot.msg. install showconsole package to get it.
 if [ -x /sbin/blogd ] && ! is_no "$RC_BOOTLOG"; then
@@ -575,9 +598,7 @@
 	fi
 
 	# Load modules
-	if [ -x /etc/rc.d/rc.modules ]; then
-		/etc/rc.d/rc.modules
-	fi
+	load_kernel_modules
 
 	if [ -x /sbin/multipath ]; then
 		# first make nodes that were discarded due (possible) new /dev mount