X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fpbt-client.c;h=a4ad0e926f35155f4e2557a62a6f3138d9a304ed;hp=445c865d82ed54b7588bd4dc731afaeb13ba7f0b;hb=a1fb38f17bfa60aac89d0dd21dd8ccc739d794bf;hpb=c11bcba9a99e858e618f4d872a5be7d52dcaaa5a

diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index 445c865..a4ad0e9 100644
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <string.h>
 
@@ -30,6 +29,7 @@
 #include "log/log.h"
 #include "talloc/talloc.h"
 #include "waiter/waiter.h"
+#include "process/process.h"
 #include "ui/common/discover-client.h"
 
 static struct pb_opt_data *pbt_opt_data_from_item(struct pbt_item *item)
@@ -57,7 +57,7 @@ static int pbt_client_boot(struct pbt_item *item)
 	int result;
 	struct pb_opt_data *opt_data = pbt_opt_data_from_item(item);
 
-	pb_log("%s: %s\n", __func__, pbt_item_name(item));
+	pb_debug("%s: %s\n", __func__, pbt_item_name(item));
 
 	pbt_frame_status_printf(&item->pbt_client->frame, "Booting %s...",
 		pbt_item_name(item));
@@ -87,7 +87,7 @@ static int pbt_device_add(struct device *dev, struct pbt_client *client)
 	struct pbt_quad q;
 	const char *icon_file;
 
-	pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
+	pb_debug("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
 		dev->n_options);
 
 	pb_protocol_dump_device(dev, "", pb_log_get_stream());
@@ -180,7 +180,7 @@ static void pbt_device_remove(struct device *dev, struct pbt_client *client)
 	struct pbt_item *next_item;
 	struct pbt_item *i;
 
-	pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
+	pb_debug("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
 		dev->n_options);
 
 	pb_protocol_dump_device(dev, "", pb_log_get_stream());
@@ -244,7 +244,7 @@ static struct discover_client_ops pbt_client_ops = {
 
 static void pbt_client_destructor(struct pbt_client *client)
 {
-	pb_log("%s\n", __func__);
+	pb_debug("%s\n", __func__);
 
 	// move to screen twin_x11_destroy(twin_ctx);
 	talloc_free(client->discover_client);
@@ -269,6 +269,8 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
 
 	pbt_client->waitset = waitset_create(pbt_client);
 
+	process_init(pbt_client, pbt_client->waitset, false);
+
 	pbt_client->sig = "pbt_client";
 	pbt_client->frame.scr = pbt_scr_init(pbt_client, pbt_client->waitset,
 			backend, width, height, NULL, NULL);
@@ -295,7 +297,7 @@ retry_start:
 
 		start_deamon = 0;
 
-		result = pb_start_daemon();
+		result = pb_start_daemon(pbt_client);
 
 		if (!result)
 			goto retry_start;