diff options
| -rwxr-xr-x | mandriva/network-up | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mandriva/network-up b/mandriva/network-up index c23ed391..02cec997 100755 --- a/mandriva/network-up +++ b/mandriva/network-up @@ -93,13 +93,6 @@ function should_wait_network() { continue fi - ! is_false $NM_CONTROLLED && is_nm_running && USE_NM=true - # for NM controlled just ask NetworkManager - if [ "$USE_NM" = "true" ]; then - [ "$(LC_ALL=C /usr/bin/nmcli -t -f state nm)" = connected ] && \ - continue || return 0 - fi - # ignore devices that are not present ip -o link show ${DEVICE} &>/dev/null || continue @@ -114,6 +107,12 @@ function should_wait_network() { continue fi + ! is_false $NM_CONTROLLED && is_nm_running && USE_NM=true + # for NM controlled just ask NetworkManager + if [ "$USE_NM" = "true" ]; then + is_nm_active ${DEVICE} && continue || return 0 + fi + # check address is set ADDR=`ip addr show scope global ${DEVICE} | awk '/inet/ {print $2;}'` if [ -z "$ADDR" ]; then |