aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec6
-rwxr-xr-xrc.d/rc.sysinit8
-rwxr-xr-xsysconfig/network-scripts/ifup-routes2
3 files changed, 12 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 91b87d7c..ca0485c3 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.76
+Version: 5.77
Copyright: GPL
Group: System Environment/Base
Release: 1
@@ -254,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Tue Mar 13 2001 Nalin Dahyabhai <nalin@redhat.com>
+- fix typo in rc.sysinit
+- fix ifup-routes not setting DEVICE properly
+
* Tue Mar 13 2001 Bill Nottingham <notting@redhat.com>
- fix typo in ifup (#31627)
- final translation pull
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index ca3a40eb..f40d472d 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -395,8 +395,10 @@ if grep -q "options sound dmabuf=1" /etc/modules.conf 2>/dev/null ; then
RETURN=$?
fi
# Load mixer settings
- if grep -q "\(sparcaudio\|sound\)" /proc/devices 2>/dev/null && [ $RETURN -eq 0 -a -f /etc/.aumixrc -a -x /bin/aumix-minimal ]; then
- action $"Loading mixer settings: " /bin/aumix-minimal -f /etc/.aumixrc -L
+ if grep -q "\(sparcaudio\|sound\)" /proc/devices 2>/dev/null ; then
+ if [ $RETURN -eq 0 -a -f /etc/.aumixrc -a -x /bin/aumix-minimal ]; then
+ action $"Loading mixer settings: " /bin/aumix-minimal -f /etc/.aumixrc -L
+ fi
fi
fi
@@ -421,7 +423,7 @@ if [ ! -f /proc/mdstat ]; then
modprobe md >/dev/null 2>&1
fi
-if [ -f /proc/mdstat -f /etc/raidtab ]; then
+if [ -f /proc/mdstat -a -f /etc/raidtab ]; then
echo -n $"Starting up RAID devices: "
rc=0
diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes
index 61e209c9..cd57460f 100755
--- a/sysconfig/network-scripts/ifup-routes
+++ b/sysconfig/network-scripts/ifup-routes
@@ -14,6 +14,8 @@ if [ ! -f /etc/sysconfig/static-routes ]; then
exit 0
fi
+DEVICE=$1
+
#note the trailing space in the grep gets rid of aliases
grep "^$DEVICE " /etc/sysconfig/static-routes | while read device args; do
/sbin/route add -$args $device