diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-01-15 20:38:50 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2007-01-15 20:38:50 +0000 |
| commit | 591aa4691f8b378b1696b75c3da1830d9369e394 (patch) | |
| tree | 3d04e5bbdf022732e0320fb402e6d85079e3f4a5 | |
| parent | 8d39d1307500b6293d2356a10dafc3cecf1880e4 (diff) | |
| download | initscripts-591aa4691f8b378b1696b75c3da1830d9369e394.tar initscripts-591aa4691f8b378b1696b75c3da1830d9369e394.tar.gz initscripts-591aa4691f8b378b1696b75c3da1830d9369e394.tar.bz2 initscripts-591aa4691f8b378b1696b75c3da1830d9369e394.tar.xz initscripts-591aa4691f8b378b1696b75c3da1830d9369e394.zip | |
- set MACADDR, if specified, before bringing up bonding master/slaves (#218792)
| -rw-r--r-- | initscripts.spec | 5 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/initscripts.spec b/initscripts.spec index a33d5f62..1a50e56c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.45.13.EL +Version: 8.45.14.EL License: GPL Group: System Environment/Base Release: 1 @@ -193,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Jan 15 2007 Bill Nottingham <notting@redhat.com> 8.45.14.EL-1 +- set MACADDR, if specfied, before bringing up bonding master/slaves (#218792) + * Thu Jan 4 2007 Bill Nottingham <notting@redhat.com> 8.45.13.EL-1 - release bonding slaves properly (#220525) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 7c94e310..dd1907de 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -96,6 +96,13 @@ 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 + # slave device? if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then /sbin/ip link set dev ${DEVICE} down @@ -129,12 +136,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 |