aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-09-22 06:13:52 +0000
committerBill Nottingham <notting@redhat.com>2004-09-22 06:13:52 +0000
commit3b904e0c0ac6b2393b43c64378b29c1a85eab16b (patch)
tree315959fac9e24743b85ef7b4edcc8789a5d4c367
parent0c644ab62f4160e97fe78aea3fb027785cc2c3e8 (diff)
downloadinitscripts-3b904e0c0ac6b2393b43c64378b29c1a85eab16b.tar
initscripts-3b904e0c0ac6b2393b43c64378b29c1a85eab16b.tar.gz
initscripts-3b904e0c0ac6b2393b43c64378b29c1a85eab16b.tar.bz2
initscripts-3b904e0c0ac6b2393b43c64378b29c1a85eab16b.tar.xz
initscripts-3b904e0c0ac6b2393b43c64378b29c1a85eab16b.zip
don't mount usbfs without usb. also, at least be consistent
-rwxr-xr-xrc.d/rc.sysinit4
1 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 7db1a880..44c61e9e 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -24,7 +24,7 @@ fi
# Mount /proc and /sys (done here so volume labels can work with fsck)
mount -n -t proc /proc /proc
-mount -n -t usbfs /proc/bus/usb /proc/bus/usb
+[ -d /proc/bus/usb ] && mount -n -t usbfs /proc/bus/usb /proc/bus/usb
mount -n -t sysfs /sys /sys >/dev/null 2>&1
. /etc/init.d/functions
@@ -522,7 +522,7 @@ mount -f /
mount -f /proc
mount -f /sys >/dev/null 2>&1
mount -f /dev/pts
-[ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb
+[ -f /proc/bus/usb/devices ] && mount -f -t usbfs usbfs /proc/bus/usb
[ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev
# configure all zfcp (scsi over fibrechannel) devices before trying to mount them