providers:checkbox:bin:network_wait: Fix nmcli calls to comply with NM >= 0.9.10

1 files changed, 8 insertions, 3 deletions

diff --git a/bin/network_wait b/bin/network_wait
index 34e31fe..f0637d0 100755
--- a/bin/network_wait
+++ b/bin/network_wait
@@ -1,10 +1,15 @@
 #!/bin/bash
 
-set -e
-
 x=1
 while true; do
- state=$(/usr/bin/nmcli -t -f STATE nm)
+ state=$(/usr/bin/nmcli -t -f STATE nm 2>/dev/null)
+ if [[ $? != 0 ]]; then
+ state=$(/usr/bin/nmcli -t -f STATE general 2>/dev/null)
+ rc=$?
+ if [[ $rc != 0 ]]; then
+ exit $rc
+ fi
+ fi
 if [ "$state" = "connected" ]; then
 echo $state
 exit 0