From 1d7446ccf9d2671857c5f554b2a0be484e95e640 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Fri, 5 Oct 2012 16:57:32 +0200
Subject: Fix calling of firewall-cmd in ifup-post/ifdown-post.

firewall-cmd has been using combined longopts since 0.2.6
---
 sysconfig/network-scripts/ifdown-post | 2 +-
 sysconfig/network-scripts/ifup-post   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post
index 68354dea..bcf47654 100755
--- a/sysconfig/network-scripts/ifdown-post
+++ b/sysconfig/network-scripts/ifdown-post
@@ -48,7 +48,7 @@ fi
 
 # Inform firewall
 if [ -x /usr/bin/firewall-cmd -a "${REALDEVICE}" != "lo" ]; then
-    /usr/bin/firewall-cmd --remove --interface="${DEVICE}" > /dev/null 2>&1
+    /usr/bin/firewall-cmd --remove-interface="${DEVICE}" > /dev/null 2>&1
 fi
 
 # Notify programs that have requested notification
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index 1ebb9c21..ca14acf7 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -95,7 +95,7 @@ fi
 
 # Inform firewall which network zone (empty means default) this interface belongs to
 if [ -x /usr/bin/firewall-cmd -a "${REALDEVICE}" != "lo" ]; then
-    /usr/bin/firewall-cmd --zone="${ZONE}" --change --interface="${DEVICE}" > /dev/null 2>&1
+    /usr/bin/firewall-cmd --zone="${ZONE}" --change-interface="${DEVICE}" > /dev/null 2>&1
 fi
 
 # Notify programs that have requested notification
-- 
cgit v1.2.1


From 4e96fcecee7ab70295a5f2c52748cd57cbab60bb Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 12 Nov 2012 16:35:23 -0500
Subject: Revert "Use sysfs rather than iwconfig for wireless check"

This reverts commit af401fb40f6dd5139e8468dfe1bd3dafe40e8e93.
upstream removed sysfs wireless. How nice.
---
 sysconfig/network-scripts/network-functions | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 5b2f30ac..0b5b11d8 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -418,7 +418,9 @@ add_default_route ()
 
 is_wireless_device ()
 {
-    [ -d "/sys/class/net/$1/wireless" ]
+    [ -x /sbin/iwconfig ] || return 1
+    LC_ALL=C iwconfig $1 2>&1 | grep -q "no wireless extensions" || return 0
+    return 1
 }
 
 install_bonding_driver ()
-- 
cgit v1.2.1


From fb15854e3e7ff889a63cfefb0b67cfc827d47703 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 7 Dec 2012 15:57:07 -0500
Subject: Also do firewall zone poking before ifup-ipv6, for DHCPv6 (#802415,
 modified from <jpopelka@redhat.com>)

---
 sysconfig/network-scripts/ifup-eth | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 4692f63e..032f6000 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -289,6 +289,11 @@ if [ -z "${NOZEROCONF}" -a "${ISALIAS}" = "no" -a "${REALDEVICE}" != "lo" ]; the
     ip route add 169.254.0.0/16 dev ${REALDEVICE} metric $((1000 + $(cat /sys/class/net/${REALDEVICE}/ifindex))) scope link
 fi
 
+# Inform firewall which network zone (empty means default) this interface belongs to
+if [ -x /usr/bin/firewall-cmd -a "${REALDEVICE}" != "lo" ]; then
+    /usr/bin/firewall-cmd --zone="${ZONE}" --change-interface="${DEVICE}" > /dev/null 2>&1
+fi
+
 # IPv6 initialisation?
 /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
 if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
-- 
cgit v1.2.1


From a3d8303fff48dc133e1b4bb148e89ccc9db142b8 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 10 Dec 2012 12:48:19 -0500
Subject: Readd missing shebang. (#885821)

---
 sysconfig/network-scripts/ifup-post | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index ca14acf7..2e93e008 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -1,4 +1,4 @@
-
+#!/bin/sh
 
 cd /etc/sysconfig/network-scripts
 . ./network-functions
-- 
cgit v1.2.1


From 9fcf01add06e4dbf4064cfd2e97c8236c2f5a194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 19 Jan 2013 18:15:43 +0200
Subject: Sync FSF address with GPL 2 text.

---
 sysconfig/network-scripts/ifdown-eth    | 2 +-
 sysconfig/network-scripts/ifdown-tunnel | 2 +-
 sysconfig/network-scripts/ifup          | 2 +-
 sysconfig/network-scripts/ifup-eth      | 2 +-
 sysconfig/network-scripts/ifup-tunnel   | 2 +-
 sysconfig/network-scripts/ifup-wireless | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index 9c78d4fe..c3aa789c 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 . /etc/init.d/functions
 
diff --git a/sysconfig/network-scripts/ifdown-tunnel b/sysconfig/network-scripts/ifdown-tunnel
index 2853a0a8..f764f9bd 100755
--- a/sysconfig/network-scripts/ifdown-tunnel
+++ b/sysconfig/network-scripts/ifdown-tunnel
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Thanks to:
 #  - Razvan Corneliu C.R. Vilt <razvan.vilt@linux360.ro>
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 6534f5a1..f931dd8f 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 unset WINDOW # defined by screen, conflicts with our usage
 
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 032f6000..f584e43a 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 . /etc/init.d/functions
 
diff --git a/sysconfig/network-scripts/ifup-tunnel b/sysconfig/network-scripts/ifup-tunnel
index c14e0658..49c52c0b 100755
--- a/sysconfig/network-scripts/ifup-tunnel
+++ b/sysconfig/network-scripts/ifup-tunnel
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Thanks to:
 #  - Razvan Corneliu C.R. Vilt <razvan.vilt@linux360.ro>
diff --git a/sysconfig/network-scripts/ifup-wireless b/sysconfig/network-scripts/ifup-wireless
index 3f2759c4..580725fa 100755
--- a/sysconfig/network-scripts/ifup-wireless
+++ b/sysconfig/network-scripts/ifup-wireless
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Configure wireless network device options.  See iwconfig(8) for more info.
 # Valid variables:
-- 
cgit v1.2.1


From 814fac877b22577f4835afcfb2597677270f6a4c Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 8 Oct 2012 14:53:09 +0200
Subject: check an IP address for existence in ifup-alias (#852005)

---
 sysconfig/network-scripts/ifup-aliases | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index a647044f..8a59dd0a 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -139,6 +139,7 @@ function ini_env ()
        GATEWAY=$default_GATEWAY
        NO_ALIASROUTING=$default_NO_ALIASROUTING
        ONPARENT=""
+       ARPCHECK=""
 }
 
 function is_default_gateway ()
@@ -256,6 +257,14 @@ function new_interface ()
        fi
 
        if [ "$setup_this" = "yes" ] ; then
+               [ "${parent_device}" != "lo" ] &&  [ "${ARPCHECK}" != "no" ] && \
+               is_available ${parent_device} && \
+               grep -qswi "up" /sys/class/net/${parent_device}/operstate && \
+               if ! /sbin/arping -q -c 2 -w 3 -D -I ${parent_device} ${IPADDR} ; then
+                   net_log $"Error, some other host already uses address ${IPADDR}."
+                   return 1
+               fi
+
                /sbin/ip addr add ${IPADDR}/${PREFIX} brd ${BROADCAST} dev ${parent_device} label ${DEVICE}
 
 	       [ "$IPV6INIT" = "yes" ]  && /etc/sysconfig/network-scripts/ifup-ipv6 ${DEVICE}
-- 
cgit v1.2.1


From 87d60f87d68ddf8ea214dbbcc072ef4097680b6c Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 8 Oct 2012 13:35:01 +0200
Subject: Sets BONDING_OPTS before interface is brougth up

---
 sysconfig/network-scripts/ifup-eth          | 31 ++++----------------------
 sysconfig/network-scripts/network-functions | 34 ++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 28 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index f584e43a..a7add8a9 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -113,38 +113,15 @@ fi
 # Bonding initialization. For DHCP, we need to enslave the devices early,
 # so it can actually get an IP.
 if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
-
-    /sbin/ip link set dev ${DEVICE} down
-
-    # add the bits to setup driver parameters here
-    for arg in $BONDING_OPTS ; do   
-        key=${arg%%=*};
-        value=${arg##*=};
-        if [ "${key}" = "arp_ip_target" -a "${value:0:1}" != "+" ]; then
-            OLDIFS=$IFS;
-            IFS=',';
-            for arp_ip in $value; do
-		if ! grep -q $arp_ip /sys/class/net/${DEVICE}/bonding/$key; then
-                    echo +$arp_ip > /sys/class/net/${DEVICE}/bonding/$key
-		fi
-            done
-            IFS=$OLDIFS;
-        elif [ "${key}" = "arp_ip_target" ]; then
-	    if ! grep -q ${value#+} /sys/class/net/${DEVICE}/bonding/$key; then
-                echo "$value" > /sys/class/net/${DEVICE}/bonding/$key
-	    fi
-	elif [ "${key}" != "primary" ]; then
-            echo $value > /sys/class/net/${DEVICE}/bonding/$key
-        fi
-    done
-
-    /sbin/ip link set dev ${DEVICE} up
-    [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
+    install_bonding_driver ${DEVICE}
     for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do
 	    is_ignored_file "$device" && continue
 	    /sbin/ifup ${device##*/}
     done
 
+    /sbin/ip link set dev ${DEVICE} up
+    [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
+
     # add the bits to setup the needed post enslavement parameters
     for arg in $BONDING_OPTS ; do   
         key=${arg%%=*};
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 0b5b11d8..c57093df 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -427,7 +427,39 @@ install_bonding_driver ()
 {
    [ -d "/sys/class/net/$1" ] && return 0
    [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 )
-   echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null
+   if ! grep -sq "$1" /sys/class/net/bonding_masters; then
+       echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null
+   fi
+   (
+	# Set config here
+	need_config "$1"
+	source_config
+	if [ -f /sys/class/net/${DEVICE}/bonding/slaves -a $(wc -l < /sys/class/net/${DEVICE}/bonding/slaves) -eq 0 ]; then
+	        /sbin/ip link set dev ${DEVICE} down
+
+	        # add the bits to setup driver parameters here
+	        for arg in $BONDING_OPTS ; do
+	            key=${arg%%=*};
+	            value=${arg##*=};
+	            if [ "${key}" = "arp_ip_target" -a "${value:0:1}" != "+" ]; then
+	                OLDIFS=$IFS;
+	                IFS=',';
+	                for arp_ip in $value; do
+			    if ! grep -q $arp_ip /sys/class/net/${DEVICE}/bonding/$key; then
+	                        echo +$arp_ip > /sys/class/net/${DEVICE}/bonding/$key
+			    fi
+	                done
+	                IFS=$OLDIFS;
+	            elif [ "${key}" = "arp_ip_target" ]; then
+		        if ! grep -q ${value#+} /sys/class/net/${DEVICE}/bonding/$key; then
+	                    echo "$value" > /sys/class/net/${DEVICE}/bonding/$key
+		        fi
+		    elif [ "${key}" != "primary" ]; then
+	                echo $value > /sys/class/net/${DEVICE}/bonding/$key
+	            fi
+	        done
+	fi
+   )
    return 0
 }
 
-- 
cgit v1.2.1


From df519f69cba08847050ea467f35b46b5d75bb988 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@redhat.com>
Date: Fri, 25 Jan 2013 14:42:12 +0100
Subject: Correctly detect Open vSwitch device types

ifup-ovs in the openvswitch package uses the types:

 - OVSBridge
 - OVSPort
 - OVSIntPort
 - OVSBond

to configure the various Open vSwitch device types. Automatically
detecting these avoids the need to pass in DEVICETYPE=ovs or to
name all bridge "ovsN".
---
 sysconfig/network-scripts/network-functions | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index c57093df..dd968f0b 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -150,6 +150,9 @@ source_config ()
 	InfiniBand | infiniband)
 		DEVICETYPE="ib"
 		;;
+	OVS*)
+		DEVICETYPE="ovs"
+		;;
     esac
     if [ -n "$HWADDR" ]; then
         HWADDR=$(echo $HWADDR | awk '{ print toupper($0) }')
-- 
cgit v1.2.1


From 08ae592f83dfa9c6e83d42f0d6e20543c253a685 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 26 Feb 2013 16:57:05 +0100
Subject: Fix greps to correctly handle comments and quotation

---
 sysconfig/network-scripts/ifdown-eth        | 2 +-
 sysconfig/network-scripts/ifup-eth          | 2 +-
 sysconfig/network-scripts/network-functions | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index c3aa789c..3d6d791e 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -53,7 +53,7 @@ fi
 fi
 
 if is_bonding_device ${DEVICE} ; then
-    for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do
+    for device in $(LANG=C grep -l "^[[:space:]]*MASTER=\"\?${DEVICE}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do
 	is_ignored_file "$device" && continue
 	/sbin/ifdown ${device##*/}
     done
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index a7add8a9..56169eca 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -114,7 +114,7 @@ fi
 # so it can actually get an IP.
 if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
     install_bonding_driver ${DEVICE}
-    for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do
+    for device in $(LANG=C grep -l "^[[:space:]]*MASTER=\"\?${DEVICE}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do
 	    is_ignored_file "$device" && continue
 	    /sbin/ifup ${device##*/}
     done
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index dd968f0b..bbfa35b0 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -22,7 +22,7 @@ get_hwaddr ()
 
 get_config_by_device ()
 {
-    LANG=C grep -l "^[[:space:]]*DEVICE=${1}\([[:space:]#]\|$\)" \
+    LANG=C grep -l "^[[:space:]]*DEVICE=\"\?${1}\"\?\([[:space:]#]\|$\)" \
 	/etc/sysconfig/network-scripts/ifcfg-* \
 	| LC_ALL=C sed -e "$__sed_discard_ignored_files"
 }
-- 
cgit v1.2.1


From 5a2058771f3add88cf48033c1e24aa0e5d6efa5c Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 14 Mar 2013 11:34:45 +0100
Subject: skip nmcli for wireless device (#863707)

When NetworkMangaer is running and Wireless connection is handled by it,
skip calling nmcli for this connection on boot.
---
 sysconfig/network-scripts/ifup | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index f931dd8f..dc9ff18a 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -66,6 +66,9 @@ then
 fi
 
 if [ "$_use_nm" = "true" -a -n "$UUID" ]; then
+    if [ "foo$2" = "fooboot" ] && [ "${TYPE}" = "Wireless" ]; then
+        exit 0
+    fi
     nmcli con up uuid "$UUID"
     exit $?
 fi
-- 
cgit v1.2.1


From 88d725dff56d7244621f1ba1561ede8142d24400 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 27 Mar 2013 16:10:44 +0100
Subject: add ipip6 tunneling support (#928232, raorn@raorn.name)

---
 sysconfig/network-scripts/ifdown-tunnel     |  2 +-
 sysconfig/network-scripts/ifup-tunnel       | 11 +++++++++--
 sysconfig/network-scripts/network-functions |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown-tunnel b/sysconfig/network-scripts/ifdown-tunnel
index f764f9bd..a5384b18 100755
--- a/sysconfig/network-scripts/ifdown-tunnel
+++ b/sysconfig/network-scripts/ifdown-tunnel
@@ -32,7 +32,7 @@ need_config "$CONFIG"
 source_config
 
 # Generic tunnel devices are not supported here
-if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then
+if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 -o "$DEVICE" = ip6tnl0 ]; then
     net_log $"Device '$DEVICE' isn't supported as a valid GRE device name."
     exit 1
 fi
diff --git a/sysconfig/network-scripts/ifup-tunnel b/sysconfig/network-scripts/ifup-tunnel
index 49c52c0b..2eaa4bb7 100755
--- a/sysconfig/network-scripts/ifup-tunnel
+++ b/sysconfig/network-scripts/ifup-tunnel
@@ -39,12 +39,19 @@ fi
 case "$TYPE" in
     GRE)
 	MODE=gre
+	proto=-4
 	/sbin/modprobe ip_gre
 	;;
     IPIP)
 	MODE=ipip
+	proto=-4
 	/sbin/modprobe ipip
 	;;
+    IPIP6)
+	MODE=ipip6
+	proto=-6
+	/sbin/modprobe ip6_tunnel
+	;;
     *)
 	net_log $"Invalid tunnel type $TYPE"
 	exit 1
@@ -52,14 +59,14 @@ case "$TYPE" in
 esac
 
 # Generic tunnel devices are not supported here
-if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then
+if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 -o "$DEVICE" = ip6tnl0 ]; then
     net_log $"Device '$DEVICE' isn't supported as a valid GRE device name."
     exit 1
 fi
 
 # Create the tunnel
 # The outer addresses are those of the underlying (public) network.
-/sbin/ip tunnel add "$DEVICE" mode "$MODE" \
+/sbin/ip $proto tunnel add "$DEVICE" mode "$MODE" \
     ${MY_OUTER_IPADDR:+local "$MY_OUTER_IPADDR"} \
     ${PEER_OUTER_IPADDR:+remote "$PEER_OUTER_IPADDR"} \
     ${KEY:+key "$KEY"} ${TTL:+ttl "$TTL"}
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index bbfa35b0..d240df35 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -141,7 +141,7 @@ source_config ()
 	CTC)
 		DEVICETYPE="ctc"
 		;;
-	GRE | IPIP)
+	GRE | IPIP | IPIP6)
 		DEVICETYPE="tunnel"
 		;;
 	SIT | sit)
-- 
cgit v1.2.1


From f91120eea58aefd215b05e89b521da6e6a89a1d5 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 2 Apr 2013 16:42:52 +0200
Subject: bonding: set master up before slaves

---
 sysconfig/network-scripts/ifup-eth | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 56169eca..1c3b6a31 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -114,12 +114,12 @@ fi
 # so it can actually get an IP.
 if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
     install_bonding_driver ${DEVICE}
+    /sbin/ip link set dev ${DEVICE} up
     for device in $(LANG=C grep -l "^[[:space:]]*MASTER=\"\?${DEVICE}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do
 	    is_ignored_file "$device" && continue
 	    /sbin/ifup ${device##*/}
     done
 
-    /sbin/ip link set dev ${DEVICE} up
     [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
 
     # add the bits to setup the needed post enslavement parameters
-- 
cgit v1.2.1


From 16a93c9d652a360d0805f885e730f8a5c6f2fee1 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 2 Apr 2013 17:09:55 +0200
Subject: set net.ipv6.conf..autoconf in ifup-ipv6

---
 sysconfig/network-scripts/ifup-ipv6 | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index 331073ad..3309f0a4 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -126,6 +126,7 @@ fi
 /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.forwarding=$ipv6_local_forwarding >/dev/null 2>&1
 /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_ra=$ipv6_local_auto >/dev/null 2>&1
 /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_redirects=$ipv6_local_auto >/dev/null 2>&1
+/sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.autoconf=$ipv6_local_auto >/dev/null 2>&1
 
 # Set IPv6 MTU, if given
 if [ -n "$IPV6_MTU" ]; then
-- 
cgit v1.2.1


From 983001ecfe7018a849a591462ac6d1f16c31433b Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 2 Apr 2013 17:58:35 +0200
Subject: ifdown: don't call nmcli on interface that is alread down

---
 sysconfig/network-scripts/ifdown | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 6bd1073d..b78e9438 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -46,8 +46,11 @@ if [ "$_use_nm" = "true" ]; then
 	DEVICE=$(nmcli -t --fields uuid,devices con status | awk -F ':' "\$1 == \"$UUID\" { print \$2 }")
     fi
     if [ -n "$DEVICE" ] && ! is_nm_device_unmanaged "$DEVICE" ; then
-	nmcli dev disconnect iface "$DEVICE"
-	exit $?
+        if ! LC_ALL=C nmcli -t -f STATE,DEVICE dev status | egrep -q "^(failed|disconnected|unmanaged|unavailable):$DEVICE$"; then
+            nmcli dev disconnect iface "$DEVICE"
+            exit $?
+        fi
+        exit 0
     fi
 fi
 
-- 
cgit v1.2.1


From a89df09d512e5331ad16f4f5c1bdc01acdaca4c4 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 3 Apr 2013 13:17:43 +0200
Subject: call flush addresses with scope global

---
 sysconfig/network-scripts/ifdown-eth | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index 3d6d791e..1d9e7151 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -108,9 +108,9 @@ retcode=0
 # instance instead.
 if [ -d "/sys/class/net/${REALDEVICE}" ]; then
 	if [ "${REALDEVICE}" = "${DEVICE}" ]; then
-		ip addr flush dev ${REALDEVICE} 2>/dev/null
+		ip addr flush dev ${REALDEVICE} scope global 2>/dev/null
 	else
-		ip addr flush dev ${REALDEVICE} label ${DEVICE} 2>/dev/null
+		ip addr flush dev ${REALDEVICE} label ${DEVICE} scope global 2>/dev/null
 	fi
 	
 	if [ "${SLAVE}" = "yes" -a -n "${MASTER}" ]; then
-- 
cgit v1.2.1


From 37c54313cdc16da566592c5e86b91f9a13009dda Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 8 Apr 2013 13:25:53 +0200
Subject: ifup-eth: ignore arping errors (#928379)

---
 sysconfig/network-scripts/ifup-eth | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 1c3b6a31..50e0a37a 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -221,7 +221,8 @@ else
 
         if ! LC_ALL=C ip addr ls ${REALDEVICE} | LC_ALL=C grep -q "${ipaddr[$idx]}/${prefix[$idx]}" ; then
             [ "${REALDEVICE}" != "lo" ] && [ "${arpcheck[$idx]}" != "no" ] && \
-            if ! /sbin/arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${ipaddr[$idx]} ; then
+            /sbin/arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${ipaddr[$idx]}
+            if [ $? = 1 ]; then
                 net_log $"Error, some other host already uses address ${ipaddr[$idx]}."
                 exit 1
             fi
-- 
cgit v1.2.1


From c82961615e76578f289516262846f41bc7641db0 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 9 Apr 2013 12:33:28 +0200
Subject: replace tunctl with ip tuntap (#947875)

---
 sysconfig/network-scripts/ifdown-eth |  4 +++-
 sysconfig/network-scripts/ifup-eth   | 12 +++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index 1d9e7151..99eb1a0a 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -135,7 +135,9 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then
 fi
 
 if [ "${TYPE}" = "Tap" ]; then
-	tunctl -d "${DEVICE}" >/dev/null
+        TUNMODE="mode tap"
+        [[ ${DEVICE} == tun* ]] && TUNMODE="mode tun"
+        ip tuntap del ${TUNMODE} dev ${DEVICE} >/dev/null
 fi
 
 # wait up to 5 seconds for device to actually come down...
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 50e0a37a..e76d4c24 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -64,14 +64,12 @@ if [ "${TYPE}" = "Bridge" ]; then
       done
 fi
 
-# If the device is a tap device, create it with tunctl, if available.
+# Create tap device.
 if [ "${TYPE}" = "Tap" ]; then
-      if [ ! -x /usr/sbin/tunctl ]; then
-          net_log  $"Tap support not available: tunctl not found"
-          exit 1
-      fi
-      [ -n "${OWNER}" ] && OWNER="-u ${OWNER}"
-      /usr/sbin/tunctl ${OWNER} -t ${DEVICE} > /dev/null
+      [ -n "${OWNER}" ] && OWNER="user ${OWNER}"
+      TUNMODE="mode tap"
+      [[ ${DEVICE} == tun* ]] && TUNMODE="mode tun"
+      ip tuntap add ${TUNMODE} ${OWNER} dev ${DEVICE} > /dev/null
 fi
 
 # now check the real state
-- 
cgit v1.2.1


From 47b1b79a5e8776b2100e8b55d7ab7be067e1bcd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= <vpavlin@redhat.com>
Date: Tue, 9 Apr 2013 12:53:11 +0200
Subject: Reload sysctl settings for vlans on ifup

---
 sysconfig/network-scripts/ifup | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index dc9ff18a..3582d04e 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -129,6 +129,8 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then
 	    }
 	fi
     fi
+
+    /usr/lib/systemd/systemd-sysctl --prefix "/proc/sys/net/ipv4/conf/${DEVICE}" --prefix "/proc/sys/net/ipv6/conf/${DEVICE}"
 fi
 
 if [ "${BOOTPROTO}" = "bootp" -o "${BOOTPROTO}" = "dhcp" ]; then
-- 
cgit v1.2.1


From 17ab37ef0a032855aaa3ce77c1765b982e903ca0 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Fri, 12 Apr 2013 12:59:20 +0200
Subject: try dhcpv6 after v4 failed

---
 sysconfig/network-scripts/ifup-eth | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index e76d4c24..bd524343 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -172,9 +172,16 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
 
     if /sbin/dhclient ${DHCLIENTARGS} ${DEVICE} ; then
 	echo $" done."
+	dhcpipv4="good"
     else
 	echo $" failed."
-	exit 1
+	if [[ "${IPV4_FAILURE_FATAL}"  = [Yy1]* ]] ; then
+	    exit 1
+	fi
+	if [[ "$IPV6INIT" != [yY1]* && "$DHCPV6C" != [yY1]* ]] ; then
+	    exit 1
+	fi
+	net_log "Unable to obtain IPv4 DHCP address ${DEVICE}." warning
     fi
 # end dynamic device configuration
 else 
@@ -275,7 +282,18 @@ fi
 if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
     generate_config_file_name 6
     generate_lease_file_name 6
-    /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE}
+    echo
+    echo -n $"Determining IPv6 information for ${DEVICE}..."
+    if /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE} ; then
+        echo $" done."
+    else
+        echo $" failed."
+        if [ "${dhcpipv4}" = "good" -o -n "${IPADDR}" ]; then
+            net_log "Unable to obtain IPv6 DHCP address ${DEVICE}." warning
+        else
+            exit 1
+        fi
+    fi
 fi
 
 if [ "${IPX}" = yes ]; then
-- 
cgit v1.2.1


From a9994292f1abad78d705d5cc57b44b25990cd01a Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 22 May 2013 13:27:35 +0200
Subject: network-functions: to determine state of nscd check socket not lock
 (#960779)

---
 sysconfig/network-scripts/network-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index d240df35..1cb26d1b 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -506,7 +506,7 @@ change_resolv_conf ()
     if [ $r -eq 0 ]; then
 	[ -x /sbin/restorecon ] && /sbin/restorecon /etc/resolv.conf >/dev/null 2>&1 # reset the correct context
 	/usr/bin/logger -p local7.notice -t "NET" -i "$0 : updated /etc/resolv.conf";
-	[ -e /var/lock/subsys/nscd ] && /usr/sbin/nscd -i hosts; # invalidate cache
+	[ -e /var/run/nscd/socket ] && /usr/sbin/nscd -i hosts; # invalidate cache
     fi;
     return $r;
 }
-- 
cgit v1.2.1


From c608ffa75d8efb10e98222ce1df4219230fcfc2c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 10 May 2013 14:17:01 -0400
Subject: Tweak ifup/ifdown usage and man page to more clearly state that they
 refer to configurations, not devices.

---
 sysconfig/network-scripts/ifdown | 4 ++--
 sysconfig/network-scripts/ifup   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index b78e9438..65608ee2 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -12,14 +12,14 @@ cd /etc/sysconfig/network-scripts
 CONFIG=$1
 
 [ -z "$CONFIG" ] && {
-    echo $"usage: ifdown <device name>" >&2
+    echo $"usage: ifdown <configuration>" >&2
     exit 1
 }
 
 need_config "${CONFIG}"
 
 [ -f "$CONFIG" ] || {
-    echo $"usage: ifdown <device name>" >&2
+    echo $"usage: ifdown <configuration>" >&2
     exit 1
 }
 
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 3582d04e..d16eca68 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -27,7 +27,7 @@ cd /etc/sysconfig/network-scripts
 CONFIG=${1}
 
 [ -z "${CONFIG}" ] && {
-    echo $"Usage: ifup <device name>" >&2
+    echo $"Usage: ifup <configuration>" >&2
     exit 1
 }
 
@@ -35,7 +35,7 @@ need_config "${CONFIG}"
 
 [ -f "${CONFIG}" ] || {
     echo $"$0: configuration for ${1} not found." >&2
-    echo $"Usage: ifup <device name>" >&2
+    echo $"Usage: ifup <configuration>" >&2
     exit 1
 }
 
-- 
cgit v1.2.1


From ce8b72f604079a5516a12f840ed6a64629b0131e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= <vpavlin@redhat.com>
Date: Mon, 17 Jun 2013 12:27:04 +0200
Subject: ifup-eth: print error only if arping is really called (#974603)

---
 sysconfig/network-scripts/ifup-eth | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index bd524343..910ac9b8 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -225,11 +225,12 @@ else
         fi
 
         if ! LC_ALL=C ip addr ls ${REALDEVICE} | LC_ALL=C grep -q "${ipaddr[$idx]}/${prefix[$idx]}" ; then
-            [ "${REALDEVICE}" != "lo" ] && [ "${arpcheck[$idx]}" != "no" ] && \
-            /sbin/arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${ipaddr[$idx]}
-            if [ $? = 1 ]; then
-                net_log $"Error, some other host already uses address ${ipaddr[$idx]}."
-                exit 1
+            if [ "${REALDEVICE}" != "lo" ] && [ "${arpcheck[$idx]}" != "no" ] ; then
+                    /sbin/arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${ipaddr[$idx]}
+                    if [ $? = 1 ]; then
+                        net_log $"Error, some other host already uses address ${ipaddr[$idx]}."
+                        exit 1
+                    fi
             fi
 
             if ! ip addr add ${ipaddr[$idx]}/${prefix[$idx]} \
-- 
cgit v1.2.1


From bedb51dfba66749de204debb3804fd13cd20f80e Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 9 Jul 2013 15:52:46 +0200
Subject: drop useless variables from /etc/sysconfig/init

---
 sysconfig/init      | 7 -------
 sysconfig/init.s390 | 5 -----
 2 files changed, 12 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/init b/sysconfig/init
index 6c3f1238..249ae6df 100644
--- a/sysconfig/init
+++ b/sysconfig/init
@@ -15,10 +15,3 @@ SETCOLOR_FAILURE="echo -en \\033[0;31m"
 SETCOLOR_WARNING="echo -en \\033[0;33m"
 # terminal sequence to reset to the default color.
 SETCOLOR_NORMAL="echo -en \\033[0;39m"
-# Set to 'yes' to allow probing for devices with swap signatures
-AUTOSWAP=no
-# What ttys should gettys be started on?
-ACTIVE_CONSOLES=/dev/tty[1-6]
-# Set to '/sbin/sulogin' to prompt for password on single-user mode
-# Set to '/sbin/sushell' otherwise
-SINGLE=/sbin/sushell
diff --git a/sysconfig/init.s390 b/sysconfig/init.s390
index fdacee05..79955f07 100644
--- a/sysconfig/init.s390
+++ b/sysconfig/init.s390
@@ -19,8 +19,3 @@ SETCOLOR_NORMAL=
 LOGLEVEL=3
 # Set to anything other than 'no' to allow hotkey interactive startup...
 PROMPT=no
-# What ttys should gettys be started on?
-ACTIVE_CONSOLES=/dev/console
-# Set to '/sbin/sulogin' to prompt for password on single-user mode
-# Set to '/sbin/sushell' otherwise
-SINGLE=/sbin/sushell
-- 
cgit v1.2.1


From 0721d2cefd672da45402d6d558384e52a4ed8376 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 29 Jul 2013 15:17:48 +0200
Subject: consider IPV6INIT undefined as YES

---
 sysconfig/network-scripts/ifup-aliases | 2 +-
 sysconfig/network-scripts/ifup-eth     | 2 +-
 sysconfig/network-scripts/ifup-ippp    | 4 ++--
 sysconfig/network-scripts/ifup-ipv6    | 4 ++--
 sysconfig/network-scripts/ifup-sit     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 8a59dd0a..9bc815f3 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -267,7 +267,7 @@ function new_interface ()
 
                /sbin/ip addr add ${IPADDR}/${PREFIX} brd ${BROADCAST} dev ${parent_device} label ${DEVICE}
 
-	       [ "$IPV6INIT" = "yes" ]  && /etc/sysconfig/network-scripts/ifup-ipv6 ${DEVICE}
+	       [[ "$IPV6INIT" != [nN0]* ]]  && /etc/sysconfig/network-scripts/ifup-ipv6 ${DEVICE}
 
                if [ "$NO_ALIASROUTING" != yes ]; then
 
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 910ac9b8..c8287d64 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -178,7 +178,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
 	if [[ "${IPV4_FAILURE_FATAL}"  = [Yy1]* ]] ; then
 	    exit 1
 	fi
-	if [[ "$IPV6INIT" != [yY1]* && "$DHCPV6C" != [yY1]* ]] ; then
+	if [[ "$IPV6INIT" = [nN0]* || "$DHCPV6C" != [yY1]* ]] ; then
 	    exit 1
 	fi
 	net_log "Unable to obtain IPv4 DHCP address ${DEVICE}." warning
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index 3ba93328..8405c8d9 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 #
 # ifup-ippp
 # 
@@ -368,7 +368,7 @@ function addprovider()
     fi
 
     # Setup IPv6
-    if [ "$IPV6INIT" = "yes" -a ! -z "$IPV6ADDR" ]; then
+    if [[ "$IPV6INIT" != [nN0]* && ! -z "$IPV6ADDR" ]]; then
 	    # Native IPv6 use of device configured, check of encapsulation required		
             if [ "$ENCAP" = "syncppp" ]; then
 		echo $"Warning: ipppd (kernel 2.4.x and below) doesn't support IPv6 using encapsulation 'syncppp'"
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index 3309f0a4..31b3b64c 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -65,8 +65,8 @@ source_config
 REALDEVICE=${DEVICE%%:*}
 DEVICE=$REALDEVICE
 
-# 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
diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit
index eb77fc4d..01c8756c 100755
--- 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
-- 
cgit v1.2.1


From 7648a78fc9f973b111776ff8ddb32f5108f6a985 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 5 Aug 2013 15:33:08 +0200
Subject: install_bonding_driver: drop check for existing device (#991335)

Install_bonding_driver is now doing more that loading kernel driver,
so that check is not correct.
---
 sysconfig/network-scripts/network-functions | 1 -
 1 file changed, 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 1cb26d1b..c699fc0d 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -428,7 +428,6 @@ is_wireless_device ()
 
 install_bonding_driver ()
 {
-   [ -d "/sys/class/net/$1" ] && return 0
    [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 )
    if ! grep -sq "$1" /sys/class/net/bonding_masters; then
        echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null
-- 
cgit v1.2.1