diff options
| author | Bill Nottingham <notting@redhat.com> | 2004-03-17 02:22:06 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2004-03-17 02:22:06 +0000 |
| commit | 064e07a9abd41c684ba42f75290667e9a1d05f02 (patch) | |
| tree | 065134a8a71135e1426d73fdc5db965b4405bcbd | |
| parent | b59731cdf4ad4e1e46b3ad728cf94396f559ce89 (diff) | |
| download | initscripts-064e07a9abd41c684ba42f75290667e9a1d05f02.tar initscripts-064e07a9abd41c684ba42f75290667e9a1d05f02.tar.gz initscripts-064e07a9abd41c684ba42f75290667e9a1d05f02.tar.bz2 initscripts-064e07a9abd41c684ba42f75290667e9a1d05f02.tar.xz initscripts-064e07a9abd41c684ba42f75290667e9a1d05f02.zip | |
handle nomodules for usb/firewire (#113278)
| -rwxr-xr-x | rc.d/rc.sysinit | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 2cb861ca..9899ab75 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -174,7 +174,7 @@ fi # Initialize USB controller and HID devices update_boot_stage RCusb usb=0 -if ! strstr "$cmdline" nousb ; then +if ! strstr "$cmdline" nousb && ! strstr "$cmdline" nomodules ; then if ! LC_ALL=C fgrep -q "usb" /proc/devices 2>/dev/null ; then aliases=`/sbin/modprobe -c | awk '/^alias usb-controller/ { print $3 }'` if [ -n "$aliases" -a "$aliases" != "off" ]; then @@ -708,7 +708,7 @@ if [ -n "$needusbstorage" ]; then fi # Ooh, firewire too. -if ! strstr "$cmdline" nofirewire ; then +if ! strstr "$cmdline" nofirewire && ! strstr "$cmdline" nomodules ; then aliases=`/sbin/modprobe -c | awk '/^alias ieee1394-controller/ { print $3 }'` if [ -n "$aliases" -a "$aliases" != "off" ]; then for alias in $aliases ; do |