diff options
| author | Bill Nottingham <notting@redhat.com> | 2006-12-07 18:43:12 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2006-12-07 18:43:12 +0000 |
| commit | 02c573742e6c4bed7d712ff124b74042ed585797 (patch) | |
| tree | f7ac9b289338e82c3f552f62be69a95e6e162f5c | |
| parent | a1fb64f698b8247d237a57b3dea1e7abfb6d1efa (diff) | |
| download | initscripts-02c573742e6c4bed7d712ff124b74042ed585797.tar.gz initscripts-02c573742e6c4bed7d712ff124b74042ed585797.tar.xz initscripts-02c573742e6c4bed7d712ff124b74042ed585797.zip | |
back out... save for 5.1
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/initscripts.spec b/initscripts.spec index 62550f8b..2fc4325e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -193,8 +193,6 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -- set MACADDR, MTU before initializing slave devices (#218792) - * Fri Dec 1 2006 Bill Nottingham <notting@redhat.com> 8.45.11.EL-1 - translation updates: bn, fr, hi, ko, ml, te, zh_CN, zh_TW (#216097) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 84500851..7c94e310 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -96,16 +96,6 @@ if [ -n "${BRIDGE}" -a -x /usr/sbin/brctl ]; then exit 0 fi -# this isn't the same as the MAC in the configuration filename. It is -# available as a configuration option in the config file, forcing the kernel -# to think an ethernet card has a different MAC address than it really has. -if [ -n "${MACADDR}" ]; then - ip link set dev ${DEVICE} address ${MACADDR} -fi -if [ -n "${MTU}" ]; then - ip link set dev ${DEVICE} mtu ${MTU} -fi - # slave device? if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then /sbin/ip link set dev ${DEVICE} down @@ -139,6 +129,16 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then done fi +# this isn't the same as the MAC in the configuration filename. It is +# available as a configuration option in the config file, forcing the kernel +# to think an ethernet card has a different MAC address than it really has. +if [ -n "${MACADDR}" ]; then + ip link set dev ${DEVICE} address ${MACADDR} +fi +if [ -n "${MTU}" ]; then + ip link set dev ${DEVICE} mtu ${MTU} +fi + if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then # Remove any temporary references which were previously added to dhclient config |