diff options
| author | Bill Nottingham <notting@redhat.com> | 2004-09-17 20:36:36 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2004-09-17 20:36:36 +0000 |
| commit | c02916812fc8a1cb8becbcffe58e6ad9d4e05708 (patch) | |
| tree | bd678755bac34e7781291814a156b66d79696988 | |
| parent | cbdc9d3a8c729e68668823d68939df7213c38539 (diff) | |
| download | initscripts-c02916812fc8a1cb8becbcffe58e6ad9d4e05708.tar initscripts-c02916812fc8a1cb8becbcffe58e6ad9d4e05708.tar.gz initscripts-c02916812fc8a1cb8becbcffe58e6ad9d4e05708.tar.bz2 initscripts-c02916812fc8a1cb8becbcffe58e6ad9d4e05708.tar.xz initscripts-c02916812fc8a1cb8becbcffe58e6ad9d4e05708.zip | |
fix handling of nonexistent devices (#132839)
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 2 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 4ad0c22f..4092c0f1 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -148,7 +148,7 @@ if [ -n "${HWADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 '/$HWADDR/ { print $2 }'` - rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || { + [ -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 ee4290d8..a235c049 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -187,6 +187,9 @@ is_available () echo "$HOTPLUG" > /proc/sys/kernel/hotplug if [ -n "$HWADDR" ]; then local curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 '/$HWADDR/ { print $2 }'` + if [ -z "$curdev" ]; then + return 1 + fi rename_device "$1" "$HWADDR" "$curdev" fi LC_ALL= LANG= ip -o link | grep -q $1 |