aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/init.d/network
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-02-28 16:56:40 -0500
committerPetr Lautrbach <plautrba@redhat.com>2011-08-15 09:51:51 +0200
commit13c5a4efdd53445e0d92d71d630402a2a20d689e (patch)
treeda16c93e5eeebde4d334c4f83c25ea49f70b8e14 /rc.d/init.d/network
parentf3c07cb56343bd35f9e62586d2d3766946f5c094 (diff)
downloadinitscripts-13c5a4efdd53445e0d92d71d630402a2a20d689e.tar
initscripts-13c5a4efdd53445e0d92d71d630402a2a20d689e.tar.gz
initscripts-13c5a4efdd53445e0d92d71d630402a2a20d689e.tar.bz2
initscripts-13c5a4efdd53445e0d92d71d630402a2a20d689e.tar.xz
initscripts-13c5a4efdd53445e0d92d71d630402a2a20d689e.zip
Move sysctl.conf/sysctl.d handling to a function, call it where appropriate. (#593211, continued)
Diffstat (limited to 'rc.d/init.d/network')
-rwxr-xr-xrc.d/init.d/network4
1 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 558b98f7..2cab6860 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -58,7 +58,7 @@ case "$1" in
/etc/sysconfig/network-scripts/init.ipv6-global start pre
fi
- sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+ apply_sysctl
# bring up loopback interface
action $"Bringing up loopback interface: " ./ifup ifcfg-lo
@@ -142,7 +142,7 @@ case "$1" in
/etc/sysconfig/network-scripts/init.ipv6-global start post
fi
# Run this again to catch any interface-specific actions
- sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+ apply_sysctl
touch /var/lock/subsys/network