- move $MODULES_CONF closer where it is used

svn-id: @8904

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 36b58fd1604e627a1e9987c8c8775b6fc6c069f0..afa2b0f1d71ad9500e8f9aff64d145b374cdb261 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -69,14 +69,6 @@ if ! is_yes "$VSERVER" ; then
                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 @@ if ! is_yes "$VSERVER"; then
        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 }')