diff options
author | Colin Guthrie <colin@mageia.org> | 2013-10-17 19:56:43 +0100 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2013-10-18 09:35:39 +0100 |
commit | 9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3 (patch) | |
tree | 3a122662900195e7b14067a03cd5124358db9daf /sysconfig/network-scripts/ifup-sit | |
parent | 423b437e3d29673dfad4051515506e6d711d20e6 (diff) | |
parent | 8f5a82934f801ec94847fc899d235a39df9967a7 (diff) | |
download | initscripts-user/colin/update-to-9-50.tar initscripts-user/colin/update-to-9-50.tar.gz initscripts-user/colin/update-to-9-50.tar.bz2 initscripts-user/colin/update-to-9-50.tar.xz initscripts-user/colin/update-to-9-50.zip |
Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50
Tag as initscripts-9.50-1
Conflicts:
Makefile
lang.csh
lang.sh
po/Makefile
rc.d/init.d/network
service
sysconfig.txt
sysconfig/init
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ippp
sysconfig/network-scripts/network-functions
sysctl.conf
systemd/fedora-storage-init
Diffstat (limited to 'sysconfig/network-scripts/ifup-sit')
-rw-r--r-- | sysconfig/network-scripts/ifup-sit | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit index 1d395e99..e83ef058 100644 --- a/sysconfig/network-scripts/ifup-sit +++ b/sysconfig/network-scripts/ifup-sit @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # ifup-sit # @@ -43,8 +43,8 @@ source_config REALDEVICE=${DEVICE%%:*} [ "$DEVICE" != "$REALDEVICE" ] && exit 0 -# Test whether IPv6 configuration is enabled for this interface, else stop -[ "$IPV6INIT" = "yes" ] || exit 0 +# Test whether IPv6 configuration is disabled for this interface +[[ "$IPV6INIT" = [nN0]* ]] && exit 0 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 . /etc/sysconfig/network-scripts/network-functions-ipv6 |