SVN: rc-scripts/trunk: doc/net-scripts.txt sysconfig/network-scripts/ifup

[glen]

Author: glen
Date: Mon Jul 25 08:10:15 2011
New Revision: 12271

Modified:
   rc-scripts/trunk/doc/net-scripts.txt
   rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
- add $ETHTOOL_OPTS

Modified: rc-scripts/trunk/doc/net-scripts.txt
==============================================================================
--- rc-scripts/trunk/doc/net-scripts.txt	(original)
+++ rc-scripts/trunk/doc/net-scripts.txt	Mon Jul 25 08:10:15 2011
@@ -82,6 +82,7 @@
     ONBOOT=yes|no
     USERCTL=yes|no
     BOOTPROTO=none|bootp|dhcp|pump|zeroconf|auto
+    ETHTOOL_OPTS=
 
   If BOOTPROTO is not "none", then the only other item that
   must be set is the DEVICE item; all the rest will be determined
@@ -92,6 +93,16 @@
     configuration matrix for IPX.  Only used if IPX is active.
     Managed from /etc/sysconfig/network-scripts/ifup-ipx
 
+  Deprecated, but supported:
+    ETHTOOL_OPTS=...
+      Any device-specific options supported by ethtool. For example,
+      if you wanted to force 100Mb full duplex:
+        ETHTOOL_OPTS="speed 100 duplex full autoneg off"
+      Note that changing speed or duplex settings almost always
+      requires disabling autonegotiation with 'autoneg off'.
+
+      Long term, this should be done by sysadmin-written udev rules.
+
   PPP/SLIP items:
     PERSIST=yes|no
     MODEMPORT=<device, say /dev/modem>

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup	Mon Jul 25 08:10:15 2011
@@ -100,6 +100,10 @@
 	nls "Enslaving %s to %s" "$DEVICE" "$MASTER"
 	ifenslave $RFLAG "$MASTER" "$DEVICE"
 
+	if [ -n "$ETHTOOL_OPTS" ] ; then
+		/sbin/ethtool -s $DEVICE $ETHTOOL_OPTS
+	fi
+
 	exit 0
 fi