X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fpbt-client.c;fp=ui%2Ftwin%2Fpbt-client.c;h=bcd17c9153f60e590d8cbccffbbdeda490a39118;hp=8d7991a415d9370e42205d83fc328a7b0b50d6ee;hb=f4c558294089f7449e6f536300ddd1aa94d2cf20;hpb=52b9db95764fcdee9195113d7df225634a19c9f4

diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index 8d7991a..bcd17c9 100644
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -289,12 +289,12 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
 		goto fail_scr_init;
 
 	/* Loop here for scripts that just started the server. */
-if (1) {
-start_deamon:
-	for (i = 10; i; i--) {
+
+retry_start:
+	for (i = start_deamon ? 2 : 10; i; i--) {
 		pbt_client->discover_client
 			= discover_client_init(&pbt_client_ops, pbt_client);
-		if (pbt_client->discover_client)
+		if (pbt_client->discover_client || !i)
 			break;
 		pb_log("%s: waiting for server %d\n", __func__, i);
 		sleep(1);
@@ -308,7 +308,7 @@ start_deamon:
 		result = pb_start_daemon();
 
 		if (!result)
-			goto start_deamon;
+			goto retry_start;
 
 		pb_log("%s: discover_client_init failed.\n", __func__);
 		fprintf(stderr, "%s: error: discover_client_init failed.\n",
@@ -330,7 +330,7 @@ start_deamon:
 	waiter_register(discover_client_get_fd(pbt_client->discover_client),
 		WAIT_IN, (waiter_cb)discover_client_process,
 		pbt_client->discover_client);
-}
+
 	return pbt_client;
 
 fail_client_init: