diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2002-12-17 19:14:49 +0000 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@redhat.com> | 2002-12-17 19:14:49 +0000 |
| commit | 2aafcc247b451e9873498cc3d072e7f36a63de9e (patch) | |
| tree | 6f6d93062657880178c44fd9dbd8fa3ebacdfe24 | |
| parent | f23abcb2c752217cd672ae164ffbced0418b7af5 (diff) | |
| download | initscripts-2aafcc247b451e9873498cc3d072e7f36a63de9e.tar initscripts-2aafcc247b451e9873498cc3d072e7f36a63de9e.tar.gz initscripts-2aafcc247b451e9873498cc3d072e7f36a63de9e.tar.bz2 initscripts-2aafcc247b451e9873498cc3d072e7f36a63de9e.tar.xz initscripts-2aafcc247b451e9873498cc3d072e7f36a63de9e.zip | |
- add a "nofirewire" option to /etc/rc.sysinit, analogous to "nousb"
| -rw-r--r-- | initscripts.spec | 3 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec index b4b4c3df..8e446f30 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/locale/*/LC_MESSAGES %changelog +* Tue Dec 17 2002 Nalin Dahyabhai <nalin@redhat.com> +- add a "nofirewire" option to /etc/rc.sysinit, analogous to "nousb" + * Tue Dec 17 2002 Bill Nottingham <notting@redhat.com> 7.00-1 - tweaks for potential GUI bootup - loop checking for network link state, don't unilterally wait five diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index e3ee1284..290c586c 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -667,12 +667,14 @@ if [ -n "$needusbstorage" ]; then fi # Ooh, firewire too. -aliases=`/sbin/modprobe -c | awk '/^alias ieee1394-controller/ { print $3 }'` -if [ -n "$aliases" -a "$aliases" != "off" ]; then +if ! grep -iq "nofirewire" /proc/cmdline 2>/dev/null ; then + aliases=`/sbin/modprobe -c | awk '/^alias ieee1394-controller/ { print $3 }'` + if [ -n "$aliases" -a "$aliases" != "off" ]; then for alias in $aliases ; do [ "$alias" != "off" ] && action $"Initializing firewire controller ($alias): " modprobe $alias done grep -q "SBP2" /proc/bus/ieee1394/devices 2>/dev/null && modprobe sbp2 >/dev/null 2>&1 + fi fi # If they asked for ide-scsi, load it |