diff options
| author | Geoff Levand <geoff@infradead.org> | 2012-03-08 20:48:21 -0800 |
|---|---|---|
| committer | Geoff Levand <geoff@infradead.org> | 2012-03-08 20:51:37 -0800 |
| commit | 604a1ccf072f9f33326fb6dc919c1b6233d40866 (patch) | |
| tree | 88297738af995f9ea8df78e134d0a2dac111d157 /ui/twin/pbt-client.c | |
| parent | ae0ba68f475ae5b057aad6538765bc8702134b9a (diff) | |
| download | talos-petitboot-604a1ccf072f9f33326fb6dc919c1b6233d40866.tar.gz talos-petitboot-604a1ccf072f9f33326fb6dc919c1b6233d40866.zip | |
Add --start-daemon option to ui programs
Add the option --start-daemon to automatically start
pb-discover if it is not already started. For use
when running as a stand-alone app.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'ui/twin/pbt-client.c')
| -rw-r--r-- | ui/twin/pbt-client.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index a2c3e93..711248a 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -264,7 +264,8 @@ static void pbt_client_destructor(struct pbt_client *client) struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, unsigned int width, unsigned int height, - int (*kexec_cb)(struct pbt_client *, struct pb_opt_data *)) + int (*kexec_cb)(struct pbt_client *, struct pb_opt_data *), + int start_deamon) { struct pbt_client *pbt_client; unsigned int i; @@ -289,17 +290,34 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, unsigned int w /* Loop here for scripts that just started the server. */ if (1) { +start_deamon: for (i = 10; i; i--) { pbt_client->discover_client = discover_client_init(&pbt_client_ops, pbt_client); - if (pbt_client->discover_client) break; - pb_log("%s: waiting for server %d\n", __func__, i); sleep(1); } + if (!pbt_client->discover_client && start_deamon) { + int result; + + start_deamon = 0; + + result = pb_start_daemon(); + + if (!result) + goto start_deamon; + + pb_log("%s: discover_client_init failed.\n", __func__); + fprintf(stderr, "%s: error: discover_client_init failed.\n", + __func__); + fprintf(stderr, "could not start pb-discover, the petitboot " + "daemon.\n"); + goto fail_client_init; + } + if (!pbt_client->discover_client) { pb_log("%s: discover_client_init failed.\n", __func__); fprintf(stderr, "%s: error: discover_client_init failed.\n", |
