diff options
| author | Bill Nottingham <notting@redhat.com> | 2006-12-07 18:19:01 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2006-12-07 18:19:01 +0000 |
| commit | 42b8d12e4c80d68305412f4a2e2cf8ba74c2bc80 (patch) | |
| tree | 529ca3c74cf688a10c3bbd8309d3e69147e8e61d | |
| parent | 86c564b85004c8cf23136f0ac0d184068c9c85ac (diff) | |
| download | initscripts-42b8d12e4c80d68305412f4a2e2cf8ba74c2bc80.tar initscripts-42b8d12e4c80d68305412f4a2e2cf8ba74c2bc80.tar.gz initscripts-42b8d12e4c80d68305412f4a2e2cf8ba74c2bc80.tar.bz2 initscripts-42b8d12e4c80d68305412f4a2e2cf8ba74c2bc80.tar.xz initscripts-42b8d12e4c80d68305412f4a2e2cf8ba74c2bc80.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 92a13ab0..17f6e7f9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -199,6 +199,8 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +- set MACADDR, MTU before initializing slave devices (#218792) + * Tue Nov 28 2006 Bill Nottingham <notting@redhat.com> 8.45.7-1 - add a step to rename any temporarily renamed devices (#208740, #214817) - network-functions-ipv6: more fixes for network module unload (#211474) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index f421060e..adc58d92 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}" != "" -a \ -x /sbin/ifenslave ]; then @@ -126,16 +136,6 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then fi 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 |