X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=35c9debfbe1113ff315eb0e9cc610b50641aea24;hp=3f82f85fe1bbe1fbba70f362afcc698535514c5f;hb=47bc66a0c744f68a84147b0bd616ab25a242fb70;hpb=947cab5c30ae89d78dff998f87b57fec91b69023

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 3f82f85..35c9deb 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -16,6 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
 #define _GNU_SOURCE
 
 #include <assert.h>
@@ -29,6 +31,7 @@
 #include "pb-protocol/pb-protocol.h"
 #include "talloc/talloc.h"
 #include "waiter/waiter.h"
+#include "process/process.h"
 #include "ui/common/discover-client.h"
 #include "nc-cui.h"
 
@@ -78,13 +81,13 @@ int cui_run_cmd(struct pmenu_item *item)
 {
 	int result;
 	struct cui *cui = cui_from_item(item);
-	const char *const *cmd_argv = item->data;
+	const char **cmd_argv = item->data;
 
 	nc_scr_status_printf(cui->current, "Running %s...", cmd_argv[0]);
 
 	def_prog_mode();
 
-	result = pb_run_cmd(cmd_argv, 1, 0);
+	result = process_run_simple_argv(item, cmd_argv);
 
 	reset_prog_mode();
 	redrawwin(cui->current->main_ncw);
@@ -470,11 +473,34 @@ static void cui_update_status(struct boot_status *status, void *arg)
 
 }
 
+static void cui_update_mm_title(struct cui *cui)
+{
+	struct nc_frame *frame = &cui->main->scr.frame;
+
+	talloc_free(frame->rtitle);
+
+	frame->rtitle = talloc_strdup(cui->main, cui->sysinfo->type);
+	if (cui->sysinfo->identifier)
+		frame->rtitle = talloc_asprintf_append(frame->rtitle,
+				" %s", cui->sysinfo->identifier);
+
+	if (cui->current == &cui->main->scr)
+		cui->current->post(cui->current);
+}
+
+static void cui_update_sysinfo(struct system_info *sysinfo, void *arg)
+{
+	struct cui *cui = cui_from_arg(arg);
+	cui->sysinfo = talloc_steal(cui, sysinfo);
+	cui_update_mm_title(cui);
+}
+
 static struct discover_client_ops cui_client_ops = {
 	.device_add = NULL,
 	.boot_option_add = cui_boot_option_add,
 	.device_remove = cui_device_remove,
 	.update_status = cui_update_status,
+	.update_sysinfo = cui_update_sysinfo,
 };
 
 /**
@@ -505,6 +531,8 @@ struct cui *cui_init(void* platform_info,
 	cui->platform_info = platform_info;
 	cui->waitset = waitset_create(cui);
 
+	process_init(cui, cui->waitset, false);
+
 	setlocale(LC_ALL, "");
 
 	/* Loop here for scripts that just started the server. */
@@ -524,7 +552,7 @@ retry_start:
 
 		start_deamon = 0;
 
-		result = pb_start_daemon();
+		result = pb_start_daemon(cui);
 
 		if (!result)
 			goto retry_start;
@@ -592,7 +620,7 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
 	while (1) {
 		int result = waiter_poll(cui->waitset);
 
-		if (result < 0 && errno != EINTR) {
+		if (result < 0) {
 			pb_log("%s: poll: %s\n", __func__, strerror(errno));
 			break;
 		}