aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec6
-rwxr-xr-xrc.d/rc.sysinit42
2 files changed, 28 insertions, 20 deletions
diff --git a/initscripts.spec b/initscripts.spec
index ea213d4d..6dda7972 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 5.34
+Version: 5.35
Copyright: GPL
Group: System Environment/Base
Release: 1
@@ -229,6 +229,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Tue Jul 18 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- add "nousb" command line parameter
+- fix some warnings when mounting /proc/bus/usb
+
* Sat Jul 15 2000 Matt Wilson <msw@redhat.com>
- kill all the PreTransaction stuff
- directory ownership cleanups, add more LSB symlinks
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index d61862ef..d249db77 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -146,25 +146,29 @@ fi
# Initialize USB controller and HID devices
-usb=1
-modprobe usb-controller 2>/dev/null || usb=0
-if [ $usb = "0" ] ; then
- usbpresent=`grep -i usb /proc/pci`
- uhci=`grep -A2 -i usb /proc/pci |grep "I/O at"`
-
- # Don't try to initialize disabled USB controllers
- uhciirq=`grep -A1 -i usb /proc/pci |grep "IRQ"`
- if [ -n "$usbpresent" ]; then
- usb=1
- if [ -n "$uhci" ] && [ -n "$uhciirq" ] ; then
- modprobe uhci 2>/dev/null || usb=0
- else
- modprobe usb-ohci 2>/dev/null || usb=0
+if [ grep -q "nousb" /proc/cmdline 2>/dev/null ]; then
+ usb=0
+else
+ usb=1
+ modprobe usb-controller 2>/dev/null || usb=0
+ if [ $usb = "0" ] ; then
+ usbpresent=`grep -i usb /proc/pci`
+ uhci=`grep -A2 -i usb /proc/pci |grep "I/O at"`
+
+ # Don't try to initialize disabled USB controllers
+ uhciirq=`grep -A1 -i usb /proc/pci |grep "IRQ"`
+ if [ -n "$usbpresent" ]; then
+ usb=1
+ if [ -n "$uhci" ] && [ -n "$uhciirq" ] ; then
+ modprobe uhci 2>/dev/null || usb=0
+ else
+ modprobe usb-ohci 2>/dev/null || usb=0
+ fi
fi
- fi
-fi
-if [ $usb = "1" ]; then
- action "Initializing USB controller: " /bin/true
+ fi
+ if [ $usb = "1" ]; then
+ action "Initializing USB controller: " /bin/true
+ fi
fi
if [ $usb = "1" ]; then
@@ -272,7 +276,7 @@ rm -f /etc/mtab~ /etc/mtab~~
# Enter root and /proc and /proc/bus/usb into mtab.
mount -f /
mount -f /proc
-[ -f /proc/bus/usb/devices ] && mount -f /proc/bus/usb
+[ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb
# Turn on harddisk optimization
if [ -f /etc/sysconfig/harddisks ] && [ -x /sbin/hdparm ]; then