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

[glen]

Author: glen
Date: Tue Oct 30 20:42:24 2007
New Revision: 8904

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- move $MODULES_CONF closer where it is used

Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Tue Oct 30 20:42:24 2007
@@ -69,14 +69,6 @@
 		mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
 	fi
 
-	if [ $(kernelverser) = "002006" ]; then
-		MODULES_CONF=/etc/modprobe.conf
-	elif [ -r /etc/modules.conf ]; then
-		MODULES_CONF=/etc/modules.conf
-	else
-		MODULES_CONF=/etc/conf.modules
-	fi
-
 	# PLD Linux LiveCD support
 	if [ -x /etc/rc.d/rc.live ]; then
 		/etc/rc.d/rc.live
@@ -505,6 +497,14 @@
 	fi
 
 	# Load sound modules if they need persistent DMA buffers
+	if [ $(kernelverser) = "002006" ]; then
+		MODULES_CONF=/etc/modprobe.conf
+	elif [ -r /etc/modules.conf ]; then
+		MODULES_CONF=/etc/modules.conf
+	else
+		MODULES_CONF=/etc/conf.modules
+	fi
+
 	if grep -q "^options sound dmabuf=1" "$MODULES_CONF" 2>/dev/null ; then
 		RETURN=0
 		alias=$(/sbin/modprobe -c | egrep -s "^alias[[:space:]]+sound[[:space:]]+" 2>/dev/null | awk '{ print $3 }')