diff options
| author | Bill Nottingham <notting@redhat.com> | 2006-12-07 18:18:22 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2006-12-07 18:18:22 +0000 |
| commit | a1fb64f698b8247d237a57b3dea1e7abfb6d1efa (patch) | |
| tree | 3d80b3ecdbd1bfe2947ca1359c2561ebf97a5203 | |
| parent | 7848a765dd3a1ae8394442f21f35e11c52dc6cd8 (diff) | |
| download | initscripts-a1fb64f698b8247d237a57b3dea1e7abfb6d1efa.tar initscripts-a1fb64f698b8247d237a57b3dea1e7abfb6d1efa.tar.gz initscripts-a1fb64f698b8247d237a57b3dea1e7abfb6d1efa.tar.bz2 initscripts-a1fb64f698b8247d237a57b3dea1e7abfb6d1efa.tar.xz initscripts-a1fb64f698b8247d237a57b3dea1e7abfb6d1efa.zip | |
- set MACADDR, MTU before initializing slave devices (#218792)
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/initscripts.spec b/initscripts.spec index 2fc4325e..62550f8b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -193,6 +193,8 @@ 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 7c94e310..84500851 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -96,6 +96,16 @@ 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 @@ -129,16 +139,6 @@ 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 |