From fca87ebae05b19c0da51c1b996f4bddad82c3115 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 21 Nov 2005 08:52:49 +0000
Subject: 'upgpkg: hwdetect fixed module order, added load_modules=off to
 rc.sysinit'

---
 rc.sysinit | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'rc.sysinit')

diff --git a/rc.sysinit b/rc.sysinit
index 9111a11..ff862be 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -236,18 +236,20 @@ fi
 [ "`grep usbfs /proc/filesystems`" ] && mount -t usbfs none /proc/bus/usb
 
 # Load modules from the MODULES array defined in rc.conf
-if [ -f /proc/modules ]; then
-	stat_busy "Loading Modules"
-	for mod in "${MODULES[@]}"; do
-		if [ "$mod" = "${mod#!}" ]; then
-			/sbin/modprobe $mod
+if ! [ "$load_modules" = "off" ]; then 
+	if [ -f /proc/modules ]; then
+		stat_busy "Loading Modules"
+		for mod in "${MODULES[@]}"; do
+			if [ "$mod" = "${mod#!}" ]; then
+				/sbin/modprobe $mod
+			fi
+		done
+		if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then
+			export BLACKLIST="${MOD_BLACKLIST[*]}"
+			/sbin/hwdetect -load-modules
 		fi
-	done
-	if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then
-		export BLACKLIST="${MOD_BLACKLIST[*]}"
-		/sbin/hwdetect -load-modules
+		stat_done
 	fi
-	stat_done
 fi
 
 # Screen blanks after 15 minutes idle time
-- 
cgit v1.2.3