diff options
| author | Bill Nottingham <notting@redhat.com> | 2004-03-17 02:42:34 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2004-03-17 02:42:34 +0000 |
| commit | 9262352718c703c976eb4a94b0783dd18815a80c (patch) | |
| tree | af2b08a0ef2dbfbf4b25de5307b5e1133b30fe91 | |
| parent | 21031db783b5059b441a096fad1e4348b96fbca7 (diff) | |
| download | initscripts-9262352718c703c976eb4a94b0783dd18815a80c.tar initscripts-9262352718c703c976eb4a94b0783dd18815a80c.tar.gz initscripts-9262352718c703c976eb4a94b0783dd18815a80c.tar.bz2 initscripts-9262352718c703c976eb4a94b0783dd18815a80c.tar.xz initscripts-9262352718c703c976eb4a94b0783dd18815a80c.zip | |
fix some of the MACADDR/HWADDR conflicts (#110427)
| -rw-r--r-- | src/redhat-support-check.c | 1 | ||||
| -rw-r--r-- | sysconfig.txt | 4 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/redhat-support-check.c b/src/redhat-support-check.c index 280cebc1..6d97ca2e 100644 --- a/src/redhat-support-check.c +++ b/src/redhat-support-check.c @@ -118,6 +118,7 @@ int main(int argc, char **argv) { int cpus; int rc = 0; + printf ("%d\n",get_memory()); setlocale(LC_ALL, ""); bindtextdomain("redhat-support-check", "/usr/share/locale"); textdomain("redhat-support-check"); diff --git a/sysconfig.txt b/sysconfig.txt index 7e48ad7f..3668b521 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -524,6 +524,10 @@ Files in /etc/sysconfig/network-scripts/ use the specified source address for outgoing packets HWADDR= ethernet hardware address for this device + MACADDR= + Set the hardware address for this device to this. + Use of this in conjunction with HWADDR= may cause + unintended behavior. If BOOTPROTO is not "none", then the only other item that must be set is the DEVICE item; all the rest will be determined diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index ce8f2110..7aa852ca 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -49,7 +49,7 @@ fi # Check to make sure the device is actually up check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && [ -n "$VLAN" -a "$VLAN" != "yes" ] && exit 0 -if [ -n "${HWADDR}" ]; then +if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then NEWCONFIG=`fgrep -il "HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*` |