aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-09-27 20:03:22 +0000
committerBill Nottingham <notting@redhat.com>2004-09-27 20:03:22 +0000
commit6d66aa5caf891f469ea60d3c2e06a01382fae58c (patch)
tree5934f2c117ad61a4dd130eefa6cfec71d90a4a9a /sysconfig
parente5860bb988bb0b19d72cae0a3a07125c8c042019 (diff)
downloadinitscripts-6d66aa5caf891f469ea60d3c2e06a01382fae58c.tar
initscripts-6d66aa5caf891f469ea60d3c2e06a01382fae58c.tar.gz
initscripts-6d66aa5caf891f469ea60d3c2e06a01382fae58c.tar.bz2
initscripts-6d66aa5caf891f469ea60d3c2e06a01382fae58c.tar.xz
initscripts-6d66aa5caf891f469ea60d3c2e06a01382fae58c.zip
be more liberal in what we accept for link types (#90602, #127984)
Diffstat (limited to 'sysconfig')
-rw-r--r--sysconfig/network-scripts/network-functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index c3493a75..a4d74c02 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -10,7 +10,7 @@ export PATH
get_hwaddr ()
{
LC_ALL= LANG= ip -o link show ${1} 2>/dev/null | \
- sed 's/.*link\/ether \([[:alnum:]:]*\).*/\1/' | \
+ sed 's/.*link\/[^ ]* \([[:alnum:]:]*\).*/\1/' | \
awk '{ print toupper($0) }'
}