From 982b6ebfe2cdb1175bc8486135d33b897ad3d6ef Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 28 Jun 2011 14:40:13 -0400
Subject: Allow non-'-s' options in ETHTOOL_OPTS, and allow multiple option
 types. (#692410, #693583)

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

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index f46a8843..e4c65aa0 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -99,9 +99,7 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
 	/sbin/ip link set dev ${DEVICE} down
 	echo "+${DEVICE}" > /sys/class/net/${MASTER}/bonding/slaves 2>/dev/null
     }
-    if [ -n "$ETHTOOL_OPTS" ] ; then
-        /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
-    fi
+    ethtool_set
 
     exit 0
 fi
@@ -158,9 +156,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then
       fi
       /sbin/ip addr flush dev ${DEVICE} 2>/dev/null
       /sbin/ip link set dev ${DEVICE} up
-      if [ -n "$ETHTOOL_OPTS" ] ; then
-        /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
-      fi
+      ethtool_set
       [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
       /usr/sbin/brctl addif ${BRIDGE} ${DEVICE}
       # Upon adding a device to a bridge,
@@ -199,9 +195,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
 	exit 1
     fi
 
-    if [ -n "$ETHTOOL_OPTS" ] ; then
-        /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
-    fi
+    ethtool_set
 
     if /sbin/dhclient ${DHCLIENTARGS} ${DEVICE} ; then
 	echo $" done."
@@ -214,9 +208,7 @@ else
     if [ -z "${IPADDR}" -a -z "${IPADDR0}" -a -z "${IPADDR1}" -a -z "${IPADDR2}" ]; then
          # enable device without IP, useful for e.g. PPPoE
 	 ip link set dev ${REALDEVICE} up
-	 if [ -n "$ETHTOOL_OPTS" ] ; then
-	 	/sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
-	 fi
+	 ethtool_set
 	 [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
     else
   
@@ -230,9 +222,7 @@ else
 	exit 1
     fi
 
-    if [ -n "$ETHTOOL_OPTS" ] ; then
-        /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
-    fi
+    ethtool_set
 
     [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
 
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 2d3263a2..f6d2f05b 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -153,7 +153,21 @@ source_config ()
     fi
 }
 
-
+ethtool_set()
+{
+    oldifs=$IFS;
+    IFS=';';
+    for opts in $ETHTOOL_OPTS ; do
+	IFS=$oldifs;
+        if [[ "${opts}" =~ [[:space:]]*- ]]; then
+	    /sbin/ethtool $opts
+        else
+	    /sbin/ethtool -s ${REALDEVICE} $opts
+        fi
+	IFS=';';
+    done
+    IFS=$oldifs;
+}
 
 expand_config ()
 {
-- 
cgit v1.2.1