diff options
Diffstat (limited to 'rc.d/init.d/network')
| -rwxr-xr-x | rc.d/init.d/network | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index dd4fcb8e..9b86aa70 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -69,7 +69,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 if [ -r /etc/ethers -a -x /sbin/arp ]; then action "Storing ARP mapping" /sbin/arp -f /etc/ethers @@ -123,6 +123,10 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi + if [ "$SLAVE" = "yes" ]; then + continue + fi + if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then vpninterfaces="$vpninterfaces $i" continue @@ -146,10 +150,6 @@ case "$1" in continue fi - if [ "$SLAVE" = "yes" ]; then - continue - fi - if LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then # this loads the module, to preserve ordering is_available $i @@ -200,8 +200,8 @@ 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 ;; stop) |