ifup-eth: tabs to spaces in our modifications as per upstream

1 files changed, 65 insertions, 65 deletions

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 81729517..62a77126 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -134,9 +134,9 @@ if is_wireless_device ${DEVICE}; then
     ip link set dev ${DEVICE} up
     if [ -n "${daemon}" -o "$MII_NOT_SUPPORTED" = "yes" ]; then
         # try to trigger association (and always load wireless settings)
-	WIRELESS_CONFIG="wireless.d/$WIRELESS_ESSID"
-	[ -f "$WIRELESS_CONFIG" ] && source "$WIRELESS_CONFIG"
-	. ./ifup-wireless
+        WIRELESS_CONFIG="wireless.d/$WIRELESS_ESSID"
+        [ -f "$WIRELESS_CONFIG" ] && source "$WIRELESS_CONFIG"
+        . ./ifup-wireless
         if [ -n "$WIRELESS_WPA_DRIVER" -a -x /usr/sbin/wpa_supplicant -a -f /etc/wpa_supplicant.conf ]; then
             if wpa_cli -i${DEVICE} status &>/dev/null; then
                 echo "Another wpa_supplicant instance is already running for device $DEVICE"
@@ -149,7 +149,7 @@ if is_wireless_device ${DEVICE}; then
                 sleep 2
                 wpa_cli reassociate
             fi
-	fi
+        fi
     elif [ -n "$WIRELESS_WPA_DRIVER" ]; then
         # roaming enabled, on association
         # source interface parameters related to current ESSID or AP if any
@@ -257,7 +257,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then
     [ -r /run/radvd/radvd.pid ] && kill -HUP $(cat /run/radvd/radvd.pid)
     exit 0
 fi
-		     
+
 # exec ifplugd daemon at boot if supported
 if [ -n "${daemon}" -a "$MII_NOT_SUPPORTED" != "yes" ]; then
     IFPLUGD_ARGS="${IFPLUGD_ARGS=-I -b}"
@@ -269,29 +269,29 @@ BLURB="# temporary ifup addition"
 
 if [ -n "$DYNCONFIG" -a "XXX$DHCP_CLIENT" = "XXX" ];then
     if [ -x /sbin/dhclient ];then
-	DHCP_CLIENT=/sbin/dhclient
-	# Remove any temporary references which were previously added to dhclient config
-	if [ -w /etc/dhclient-${DEVICE}.conf -a -x /sbin/dhclient ] ; then
-	    grep -v "$BLURB" /etc/dhclient-${DEVICE}.conf > /etc/dhclient-${DEVICE}.conf.ifupnew 2> /dev/null
-	    cat /etc/dhclient-${DEVICE}.conf.ifupnew > /etc/dhclient-${DEVICE}.conf
-	    rm -f /etc/dhclient-${DEVICE}.conf.ifupnew
-	fi
+        DHCP_CLIENT=/sbin/dhclient
+        # Remove any temporary references which were previously added to dhclient config
+        if [ -w /etc/dhclient-${DEVICE}.conf -a -x /sbin/dhclient ] ; then
+            grep -v "$BLURB" /etc/dhclient-${DEVICE}.conf > /etc/dhclient-${DEVICE}.conf.ifupnew 2> /dev/null
+            cat /etc/dhclient-${DEVICE}.conf.ifupnew > /etc/dhclient-${DEVICE}.conf
+            rm -f /etc/dhclient-${DEVICE}.conf.ifupnew
+        fi
     elif [ -x /sbin/dhcpcd ];then
-	DHCP_CLIENT=/sbin/dhcpcd
+        DHCP_CLIENT=/sbin/dhcpcd
     elif [ -x /sbin/pump ];then
-	DHCP_CLIENT=/sbin/pump
+        DHCP_CLIENT=/sbin/pump
     elif [ -x /sbin/dhcpxd ];then
-	DHCP_CLIENT=/sbin/dhcpxd
-    else 
-	echo $"Can't find a dhcp client"
-	mdv-network-event connection_failure ${DEVICE}
-	exit 1;
+        DHCP_CLIENT=/sbin/dhcpxd
+    else
+        echo $"Can't find a dhcp client"
+        mdv-network-event connection_failure ${DEVICE}
+        exit 1;
     fi
-fi  
+fi
 
 if [ "$DHCP_HOSTNAME" ] && [ "$DOMAINNAME" ]
 then
-	DHCP_HOSTNAME=`echo $DHCP_HOSTNAME | sed -e "s/\.$DOMAINNAME//g"`
+        DHCP_HOSTNAME=`echo $DHCP_HOSTNAME | sed -e "s/\.$DOMAINNAME//g"`
 fi
 
 DHCP_ARGS=
@@ -340,23 +340,23 @@ case $(basename $DHCP_CLIENT) in
     ;;
     dhclient)
     if [[ "${PERSISTENT_DHCLIENT}" = [yY1]* ]]; then
-	ONESHOT=
+        ONESHOT=
     else
-	ONESHOT="-1"
+        ONESHOT="-1"
     fi
     generate_config_file_name
     generate_lease_file_name
     DHCP_ARGS="$DHCP_ARGS $ONESHOT -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient-${DEVICE}.pid $DEVICE"
     if [ -n "$DHCP_HOSTNAME" ]; then
-	if [ ! -e /etc/dhclient-${DEVICE}.conf ] || ! grep -q "[^# ]*send *host-name" /etc/dhclient-${DEVICE}.conf; then
-	    echo "send host-name \"${DHCP_HOSTNAME}\";  $BLURB" >> /etc/dhclient-${DEVICE}.conf
-	fi
+        if [ ! -e /etc/dhclient-${DEVICE}.conf ] || ! grep -q "[^# ]*send *host-name" /etc/dhclient-${DEVICE}.conf; then
+            echo "send host-name \"${DHCP_HOSTNAME}\";  $BLURB" >> /etc/dhclient-${DEVICE}.conf
+        fi
     fi
     if [ -n "$DHCP_TIMEOUT" ]; then
-	if [ ! -e /etc/dhclient-${DEVICE}.conf ] || ! grep -q "[^# ]*timeout" /etc/dhclient-${DEVICE}.conf; then
-	    echo "timeout $DHCP_TIMEOUT;  $BLURB" >> /etc/dhclient-${DEVICE}.conf
-	fi
-    fi	
+        if [ ! -e /etc/dhclient-${DEVICE}.conf ] || ! grep -q "[^# ]*timeout" /etc/dhclient-${DEVICE}.conf; then
+            echo "timeout $DHCP_TIMEOUT;  $BLURB" >> /etc/dhclient-${DEVICE}.conf
+        fi
+    fi
     ;;
 esac
 fi
@@ -367,15 +367,15 @@ if [ -w /etc/dhclient-${DEVICE}.conf ] && [ -x /sbin/dhclient ] ; then
    cat /etc/dhclient-${DEVICE}.conf.ifupnew > /etc/dhclient-${DEVICE}.conf
    rm -f /etc/dhclient-${DEVICE}.conf.ifupnew
 fi
-		     
+
 if [ -n "${DYNCONFIG}" ]; then
     echo
     echo -n $"Determining IP information for ${DEVICE}..."
     if [[ "${PERSISTENT_DHCLIENT}" !=  [yY1]* ]] && check_link_down ${DEVICE}; then
-	echo $" failed; no link present.  Check cable?"
-	ip link set dev ${DEVICE} down >/dev/null 2>&1
-	mdv-network-event connection_failure ${DEVICE}
-	exit 1
+        echo $" failed; no link present.  Check cable?"
+        ip link set dev ${DEVICE} down >/dev/null 2>&1
+        mdv-network-event connection_failure ${DEVICE}
+        exit 1
     fi
 
     ethtool_set
@@ -383,33 +383,33 @@ if [ -n "${DYNCONFIG}" ]; then
     mdv-network-event dhcp_request ${DEVICE}
     if $DHCP_CLIENT $DHCP_ARGS ; then
         mdv-network-event dhcp_success ${DEVICE}
-	echo $" done."
-	dhcpipv4="good"
+        echo $" done."
+        dhcpipv4="good"
     else
         mdv-network-event dhcp_failure ${DEVICE}
-	# Associate a zeroconf IP address to an alias of the interface
-	if [ -x /sbin/zcip ]; then
+        # Associate a zeroconf IP address to an alias of the interface
+        if [ -x /sbin/zcip ]; then
             mdv-network-event zcip_request ${DEVICE}
-	    if /sbin/zcip -s -i $DEVICE:${ZEROCONF_ALIAS_NUMER=9}; then
+            if /sbin/zcip -s -i $DEVICE:${ZEROCONF_ALIAS_NUMER=9}; then
                 mdv-network-event zcip_success ${DEVICE}
-		echo $" done."
-		if [ -x /etc/init.d/tmdns ]; then
-		    /etc/init.d/tmdns reload > /dev/null 2>&1
-		fi
-		exit 0
-	    fi
-	fi
+                echo $" done."
+                if [ -x /etc/init.d/tmdns ]; then
+                    /etc/init.d/tmdns reload > /dev/null 2>&1
+                fi
+                exit 0
+            fi
+        fi
         mdv-network-event zcip_failure ${DEVICE}
-	echo $" failed."
-	if [[ "${IPV4_FAILURE_FATAL}"  = [Yy1]* ]] ; then
-	    mdv-network-event connection_failure ${DEVICE}
-	    exit 1
-	fi
-	if [[ "$IPV6INIT" = [nN0]* || "$DHCPV6C" != [yY1]* ]] ; then
-	    mdv-network-event connection_failure ${DEVICE}
-	    exit 1
-	fi
-	net_log "Unable to obtain IPv4 DHCP address ${DEVICE}." warning
+        echo $" failed."
+        if [[ "${IPV4_FAILURE_FATAL}"  = [Yy1]* ]] ; then
+            mdv-network-event connection_failure ${DEVICE}
+            exit 1
+        fi
+        if [[ "$IPV6INIT" = [nN0]* || "$DHCPV6C" != [yY1]* ]] ; then
+            mdv-network-event connection_failure ${DEVICE}
+            exit 1
+        fi
+        net_log "Unable to obtain IPv4 DHCP address ${DEVICE}." warning
     fi
     # end dynamic device configuration
 else 
@@ -423,12 +423,12 @@ else
     expand_config
 
     [ -n "${ARP}" ] && \
-	ip link set dev ${REALDEVICE} $(toggle_value arp $ARP)
+        ip link set dev ${REALDEVICE} $(toggle_value arp $ARP)
    
     if ! ip link set dev ${REALDEVICE} up ; then
-	net_log $"Failed to bring up ${DEVICE}."
-	mdv-network-event connection_failure ${DEVICE}
-	exit 1
+        net_log $"Failed to bring up ${DEVICE}."
+        mdv-network-event connection_failure ${DEVICE}
+        exit 1
     fi
 
     ethtool_set
@@ -436,21 +436,21 @@ else
     [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
 
     if [ "${DEVICE}" = "lo" ]; then
-    	SCOPE="scope host"
+        SCOPE="scope host"
     else
         SCOPE=${SCOPE:-}
     fi
-    
+
     if [ -n "$SRCADDR" ]; then
        SRC="src $SRCADDR"
     else
        SRC=
     fi
-    
+
     if [ "${REALDEVICE}" != "lo" ]; then
     # set IP address(es)
     for idx in {0..256} ; do
-	if [ -z "${ipaddr[$idx]}" ]; then
+        if [ -z "${ipaddr[$idx]}" ]; then
             break
         fi