aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec5
-rwxr-xr-xrc.d/rc.sysinit2
2 files changed, 5 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 6876261c..abc60528 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.37
+Version: 5.38
Copyright: GPL
Group: System Environment/Base
Release: 1
@@ -232,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Tue Jul 25 2000 Nalin Dahyabhai <nalin@redhat.com>
+- s/nill/null/g
+
* Tue Jul 25 2000 Bill Nottingham <notting@redhat.com>
- unmount usb filesystem on halt
- run /sbin/ifup-pre-local if it exists
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 18888ab4..a7348895 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -152,7 +152,7 @@ else
usb=1
modprobe usb-controller 2>/dev/null || usb=0
if [ $usb = "0" ] ; then
- usbpresent=`grep -i usb /proc/pci 2>/dev/nill`
+ usbpresent=`grep -i usb /proc/pci 2>/dev/null`
uhci=`grep -A2 -i usb /proc/pci 2>/dev/null |grep "I/O at"`
# Don't try to initialize disabled USB controllers