diff options
| author | Miloslav Trmac <mitr@volny.cz> | 2007-01-30 18:19:37 +0000 |
|---|---|---|
| committer | Miloslav Trmac <mitr@volny.cz> | 2007-01-30 18:19:37 +0000 |
| commit | 980f43c79e5f63e2e7342750a143bc3f8fc70676 (patch) | |
| tree | 6c8059224efff1cbea65ad85d7a8c583be56c7f4 | |
| parent | e758d4058576dab4a81b6fe5fb376b0ff8fd2635 (diff) | |
| download | initscripts-980f43c79e5f63e2e7342750a143bc3f8fc70676.tar.gz initscripts-980f43c79e5f63e2e7342750a143bc3f8fc70676.tar.xz initscripts-980f43c79e5f63e2e7342750a143bc3f8fc70676.zip | |
* Tue Jan 30 2007 Miloslav Trmac <mitr@redhat.com> - 7.93.28.EL-1r7-93-28-EL
- Fix MACADDR on bonding slaves
Resolves: #222711
| -rw-r--r-- | initscripts.spec | 6 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/initscripts.spec b/initscripts.spec index 3d380cb9..2c4166a7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 7.93.27.EL +Version: 7.93.28.EL License: GPL Group: System Environment/Base Release: 1 @@ -207,6 +207,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Jan 30 2007 Miloslav Trmac <mitr@redhat.com> - 7.93.28.EL-1 +- Fix MACADDR on bonding slaves + Resolves: #222711 + * Mon Jan 15 2007 Miloslav Trmac <mitr@redhat.com> - 7.93.27.EL-1 - Do unmount network mounts, not doing so can prevent other unmounting other filesystems diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 03c76047..a1a8eff3 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -210,6 +210,13 @@ is_available ${REALDEVICE} || { # is the device wireless? If so, configure wireless device specifics is_wireless_device ${DEVICE} && . ./ifup-wireless +# 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}" != "" -a \ -x /sbin/ifenslave ]; then @@ -241,12 +248,6 @@ if [ "$ISALIAS" = no ] && \ 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 |