aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-03-22 17:03:07 +0000
committerBill Nottingham <notting@redhat.com>2001-03-22 17:03:07 +0000
commitfc528cf0a64760748e5bcfb16ea3fab4cfffabd0 (patch)
tree0ef36b992f68987fb960b55232706ee062746dc6
parent1d5b9bbb9d9dcf154a276f10724794db8c3ac4e7 (diff)
downloadinitscripts-fc528cf0a64760748e5bcfb16ea3fab4cfffabd0.tar
initscripts-fc528cf0a64760748e5bcfb16ea3fab4cfffabd0.tar.gz
initscripts-fc528cf0a64760748e5bcfb16ea3fab4cfffabd0.tar.bz2
initscripts-fc528cf0a64760748e5bcfb16ea3fab4cfffabd0.tar.xz
initscripts-fc528cf0a64760748e5bcfb16ea3fab4cfffabd0.zip
use new -e argument to sysctl to ignore unknown keys (#31852)
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/init.d/network2
-rwxr-xr-xrc.d/rc.sysinit2
3 files changed, 3 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 3c21bf59..64ac9a7b 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -7,7 +7,7 @@ Release: 1
Source: initscripts-%{version}.tar.gz
BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
-Requires: procps >= 2.0.6-5, sysklogd >= 1.3.31
+Requires: procps >= 2.0.7-7, sysklogd >= 1.3.31
Requires: setup >= 2.0.3, /sbin/fuser, which
Requires: modutils >= 2.3.11-5
Requires: util-linux >= 2.10s-11
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index d6673e79..1b170e2e 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -53,7 +53,7 @@ interfaces=`ls ifcfg* | egrep -v '(ifcfg-lo|:|rpmsave|rpmorig|rpmnew)' | \
case "$1" in
start)
- action $"Setting network parameters: " sysctl -p /etc/sysctl.conf
+ action $"Setting network parameters: " sysctl -e -p /etc/sysctl.conf
action $"Bringing up interface lo: " ./ifup ifcfg-lo
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index b0ed12ca..09118608 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -54,7 +54,7 @@ action $"Mounting proc filesystem: " mount -n -t proc /proc /proc
# Configure kernel parameters
-action $"Configuring kernel parameters: " sysctl -p /etc/sysctl.conf
+action $"Configuring kernel parameters: " sysctl -e -p /etc/sysctl.conf
# Set the system clock.
ARC=0