ubuntu: Fix the wait_for_network method in the agent init script.

wido · wido · commit 42c078422cf1 · 2012-06-21T12:20:04.000+02:00
The init script was waiting for cloudbr0 to come up, but it's not mandatory that this bridge is available.

We now wait for at least one bridge to be up before starting the cloud agent.
diff --git a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
@@ -50,7 +50,9 @@ wait_for_network() {
     i=1
     while [ $i -lt 10 ]
     do
-        if ip addr show cloudbr0 |grep -w inet > /dev/null 2>&1; then
+        # Under Ubuntu and Debian libvirt by default creates a bridge called virbr0.
+        # That's why we want more then 3 lines back from brctl, so that there is a manually created bridge
+        if [ "$(brctl show|wc -l)" -gt 2 ]; then
             break
         else
             sleep 1
@@ -74,9 +76,8 @@ start() {
 		log_end_msg 1
 		exit 1
 	fi
- 
-    #FIXME: wait for network
-    wait_for_network
+
+        wait_for_network
 
 	if start-stop-daemon --start --quiet \
 		--pidfile "$PIDFILE" \
