Merge commit 'initscripts-9.34-1' into mga-34

This brings our fully patched initscripts branch up to version 9.34.

Some code was not easily merged and thus not all functionality relating
to multiple IP addresses per interface were merged in.

Conflicts:
	Makefile
	lang.csh
	lang.sh
	prefdm
	rc.d/init.d/functions
	rc.d/init.d/netfs
	rc.d/init.d/network
	rc.d/rc
	rc.d/rc.local
	rc.d/rc.sysinit
	service
	sysconfig.txt
	sysconfig/network-scripts/ifdown-eth
	sysconfig/network-scripts/ifup-eth
	sysconfig/network-scripts/ifup-ipv6
	sysconfig/network-scripts/ifup-sit
	sysconfig/network-scripts/ifup-tunnel
	sysconfig/network-scripts/network-functions
	systemd/system/fedora-sysinit-unhack.service

1 files changed, 11 insertions, 9 deletions

diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 1312eede..fc21c7b6 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -125,7 +125,7 @@ eval ` (
 
 # read defaults from the parent config file
 [ -f $PARENTCONFIG ] || {
-       echo $"Missing config file $PARENTCONFIG." >&2
+       net_log $"Missing config file $PARENTCONFIG."
        exit 1
 }
 eval ` (
@@ -169,7 +169,7 @@ function new_interface ()
 
        MATCH='^[0-9A-Za-z_]*$'
        if (LC_ALL=C; [[ ! "$DEVNUM" =~ $MATCH ]]); then
-	      echo $"error in $FILE: invalid alias number" >&2
+	      net_log $"error in $FILE: invalid alias number"
 	      return 1
        fi
 
@@ -179,17 +179,17 @@ function new_interface ()
        ";
 
        if [ -n "$ipseen" ]; then
-              echo $"error in $FILE: already seen ipaddr $IPADDR in $ipseen" >&2
+              net_log $"error in $FILE: already seen ipaddr $IPADDR in $ipseen"
 	      return 1
        fi
 
        if [ -n "$devseen" ]; then
-              echo $"error in $FILE: already seen device $parent_device:$DEVNUM in $devseen" >&2
+              net_log $"error in $FILE: already seen device $parent_device:$DEVNUM in $devseen"
 	      return 1
        fi
 
        if [ -z "$DEVICE" -o -z "$IPADDR" ]; then
-              echo $"error in $FILE: didn't specify device or ipaddr" >&2
+              net_log $"error in $FILE: didn't specify device or ipaddr"
 	      return 1
        fi
 
@@ -256,7 +256,7 @@ function new_interface ()
                                setup_this=yes
                        fi
                        if [ -n "$rdev_mark" -a "$rdev_mark" != "$newmark" ]; then
-                               echo $"error in ifcfg-${parent_device}: files" >&2
+                               net_log $"error in ifcfg-${parent_device}: files"
 			       return 1
                        fi
                        eval " rdev_${DEVNUM}_mark=\$newmark ";
@@ -267,7 +267,7 @@ function new_interface ()
                if [ -n "$rdevip" -a "$rdevip" != "${DEVNUM}" ]; then
                        eval " mark_remove=\$rdev_${rdevip}_mark ";
                        if [ -n "$mark_remove" -a "$mark_remove" != "remove" ]; then
-                               echo $"error in ifcfg-${parent_device}: files" >&2
+                               net_log $"error in ifcfg-${parent_device}: files"
 			       return 1
                        fi
                        if [ "$mark_remove" != "remove" ]; then
@@ -292,6 +292,8 @@ function new_interface ()
 
                /sbin/ifconfig ${DEVICE} ${IPADDR} netmask ${NETMASK} broadcast ${BROADCAST}
 
+	       [ "$IPV6INIT" = "yes" ]  && /etc/sysconfig/network-scripts/ifup-ipv6 ${DEVICE}
+
                if [ "$NO_ALIASROUTING" != yes ]; then
 
                        GATEWAYDEV=$network_GATEWAYDEV;
@@ -337,11 +339,11 @@ for FILE in ifcfg-${parent_device}-range* ; do
        ipaddr_endnum=${IPADDR_END##*.}
 
        if [ "${IPADDR_START%.*}" != "${IPADDR_END%.*}" ]; then
-               echo $"error in $FILE: IPADDR_START and IPADDR_END don't agree" >&2; continue
+               net_log $"error in $FILE: IPADDR_START and IPADDR_END don't agree"; continue
        fi
 
        if [ $ipaddr_startnum -gt $ipaddr_endnum ]; then
-               echo $"error in $FILE: IPADDR_START greater than IPADDR_END" >&2; continue
+               net_log $"error in $FILE: IPADDR_START greater than IPADDR_END"; continue
        fi
 
        ipaddr_num=$ipaddr_startnum