diff options
author | Bill Nottingham <notting@redhat.com> | 2006-02-02 21:32:24 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2006-02-02 21:32:24 +0000 |
commit | da0dc16e9169686e5f64e7e9b46e6131432c3080 (patch) | |
tree | 59e4b035971339d8b5c7e457591d47261852395b /sysconfig/network-scripts | |
parent | 5c1daa478a41a1cf35002fc0da6410f6545f3b1c (diff) | |
download | initscripts-da0dc16e9169686e5f64e7e9b46e6131432c3080.tar initscripts-da0dc16e9169686e5f64e7e9b46e6131432c3080.tar.gz initscripts-da0dc16e9169686e5f64e7e9b46e6131432c3080.tar.bz2 initscripts-da0dc16e9169686e5f64e7e9b46e6131432c3080.tar.xz initscripts-da0dc16e9169686e5f64e7e9b46e6131432c3080.zip |
move the arping to before we actually add the address. If the address
is already on the device, it's a little late... (fixes a xen issue)
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 52827bcc..2e7ca951 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -214,10 +214,6 @@ else /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS fi - if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then - echo $"Error, some other host already uses address ${IPADDR}." - exit 1 - fi if [ "${DEVICE}" = "lo" ]; then SCOPE="scope host" @@ -232,6 +228,10 @@ else fi if ! LC_ALL=C ip addr ls ${REALDEVICE} | LC_ALL=C grep -q "${IPADDR}/${PREFIX}" ; then + if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then + echo $"Error, some other host already uses address ${IPADDR}." + exit 1 + fi if ! ip addr add ${IPADDR}/${PREFIX} \ brd ${BROADCAST:-+} dev ${REALDEVICE} ${SCOPE} label ${DEVICE}; then echo $"Error adding address ${IPADDR} for ${DEVICE}." |