diff options
| -rwxr-xr-x | mandriva/network-up | 4 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mandriva/network-up b/mandriva/network-up index 92988936..c23ed391 100755 --- a/mandriva/network-up +++ b/mandriva/network-up @@ -93,9 +93,9 @@ function should_wait_network() { continue fi + ! is_false $NM_CONTROLLED && is_nm_running && USE_NM=true # for NM controlled just ask NetworkManager - if is_true $NM_CONTROLLED; then - [ -x /usr/bin/nmcli ] || continue + if [ "$USE_NM" = "true" ]; then [ "$(LC_ALL=C /usr/bin/nmcli -t -f state nm)" = connected ] && \ continue || return 0 fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 46789881..defe4baf 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -147,7 +147,7 @@ source_config () else ISALIAS=no fi - is_true $NM_CONTROLLED && USE_NM=true + ! is_false $NM_CONTROLLED && is_nm_running && USE_NM=true } ethtool_set() |