diff options
| author | Olivier Blin <dev@blino.org> | 2012-03-24 21:32:39 +0100 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2012-03-24 21:32:39 +0100 |
| commit | 5f74b4095a8439997516827ec6d829b6da91fdf4 (patch) | |
| tree | 07f56f38469bebb2360b3fdf77b4603e90fdf478 | |
| parent | 89432b418a1fba267bcec7e5440f50fb1d874b22 (diff) | |
| download | initscripts-5f74b4095a8439997516827ec6d829b6da91fdf4.tar initscripts-5f74b4095a8439997516827ec6d829b6da91fdf4.tar.gz initscripts-5f74b4095a8439997516827ec6d829b6da91fdf4.tar.bz2 initscripts-5f74b4095a8439997516827ec6d829b6da91fdf4.tar.xz initscripts-5f74b4095a8439997516827ec6d829b6da91fdf4.zip | |
network-up: do per-device connection check for NetworkManager
Also do not wait for NM devices with no link.
| -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 |