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

arekm cvs at pld-linux.org
Mon Dec 5 01:30:05 CET 2005


Author: arekm
Date: Mon Dec  5 01:29:57 2005
New Revision: 6597

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
udev loads core usb modules itself so /proc/bus/usb was never mounted here. Now we are checking for exact mount instead of just checking whether usb modules are loaded.

Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Mon Dec  5 01:29:57 2005
@@ -226,7 +226,7 @@
 
 	# Initialize USB controllers
 	usb=0
-	if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && ! grep -q "usb" /proc/devices 2>/dev/null ; then
+	if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && ! grep -q "/proc/bus/usb" /proc/mounts 2>/dev/null ; then
 		aliases=$(/sbin/modprobe -c | awk '/^alias usb-controller/ { print $3 }')
 		if [ -n "$aliases" -a "$aliases" != "off" ] ; then
 			/sbin/modprobe -k usbcore



More information about the pld-cvs-commit mailing list