aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-09-23 01:13:37 +0000
committerBill Nottingham <notting@redhat.com>2004-09-23 01:13:37 +0000
commit170e3ceae89a6b89db27b239a83ce88832d455ce (patch)
tree221db914c1d74ef4b6c7ad007940765c1b16070e
parent9b90e924b2c0d2c73b0d82a3a042a015347f87ca (diff)
downloadinitscripts-170e3ceae89a6b89db27b239a83ce88832d455ce.tar
initscripts-170e3ceae89a6b89db27b239a83ce88832d455ce.tar.gz
initscripts-170e3ceae89a6b89db27b239a83ce88832d455ce.tar.bz2
initscripts-170e3ceae89a6b89db27b239a83ce88832d455ce.tar.xz
initscripts-170e3ceae89a6b89db27b239a83ce88832d455ce.zip
backport
-rwxr-xr-xsysconfig/network-scripts/ifup2
-rw-r--r--sysconfig/network-scripts/network-functions2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index df17512d..d4be91da 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -143,7 +143,7 @@ is_available ${REALDEVICE}
if [ -n "${HWADDR}" ]; then
FOUNDMACADDR=`get_hwaddr ${REALDEVICE}`
if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then
- curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 '/$HWADDR/ { print $2 }'`
+ curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 "/$HWADDR/ { print \$2 }"`
[ -n "$curdev" ] && rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || {
echo $"Device ${DEVICE} has different MAC address than expected, ignoring."
exit 1
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 9162e9f7..554b6ba9 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -183,7 +183,7 @@ is_available ()
fi
modprobe $1 > /dev/null 2>&1 || return 1
if [ -n "$HWADDR" ]; then
- local curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 '/$HWADDR/ { print $2 }'`
+ local curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 "/$HWADDR/ { print \$2 }"`
if [ -z "$curdev" ]; then
return 1
fi