X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=ccc7cc3d01dc8ce0d5fa01f5dc885042461af0dc;hp=9b2ef3df4d94209c92166dadf1f07ca7d295ec81;hb=fb0fdcc59d7b0f2ed97f1894b25e4424131970f6;hpb=1435814a67d3c1a0199f84b91246b37eb8fa8b99

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 9b2ef3d..ccc7cc3 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -7,11 +7,13 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
+#include <pb-config/pb-config.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
 #include <types/types.h>
 #include <system/system.h>
+#include <process/process.h>
 #include <url/url.h>
 
 #include "device-handler.h"
@@ -30,6 +32,12 @@ struct device_handler {
 	struct discover_device	**devices;
 	unsigned int		n_devices;
 
+	struct waitset		*waitset;
+	struct waiter		*timeout_waiter;
+	bool			autoboot_enabled;
+	unsigned int		sec_to_boot;
+
+	struct discover_boot_option *default_boot_option;
 	struct list		unresolved_boot_options;
 };
 
@@ -176,6 +184,7 @@ void device_handler_destroy(struct device_handler *handler)
  * to keep struct device_handler opaque. */
 struct device_handler *device_handler_init(
 		struct discover_server *server __attribute__((unused)),
+		struct waitset *waitset __attribute__((unused)),
 		int dry_run __attribute__((unused)))
 {
 	struct device_handler *handler;
@@ -199,7 +208,7 @@ void device_handler_add_device(struct device_handler *handler,
 
 static int mount_device(struct discover_device *dev)
 {
-	const char *argv[6];
+	int rc;
 
 	if (!dev->device_path)
 		return -1;
@@ -212,29 +221,20 @@ static int mount_device(struct discover_device *dev)
 		pb_log("couldn't create mount directory %s: %s\n",
 				dev->mount_path, strerror(errno));
 
-	argv[0] = pb_system_apps.mount;
-	argv[1] = dev->device_path;
-	argv[2] = dev->mount_path;
-	argv[3] = "-o";
-	argv[4] = "ro";
-	argv[5] = NULL;
-
-	if (pb_run_cmd(argv, 1, 0)) {
+	rc = process_run_simple(dev, pb_system_apps.mount,
+			dev->device_path, dev->mount_path,
+			"-o", "ro", NULL);
 
-		/* Retry mount without ro option. */
-
-		argv[0] = pb_system_apps.mount;
-		argv[1] = dev->device_path;
-		argv[2] = dev->mount_path;
-		argv[3] = NULL;
+	if (!rc)
+		return 0;
 
-		if (pb_run_cmd(argv, 1, 0))
-			goto out_rmdir;
-	}
+	/* Retry mount without ro option. */
+	rc = process_run_simple(dev, pb_system_apps.mount,
+			dev->device_path, dev->mount_path, NULL);
 
-	return 0;
+	if (!rc)
+		return 0;
 
-out_rmdir:
 	pb_rmdir_recursive(mount_base(), dev->mount_path);
 	return -1;
 }
@@ -242,28 +242,12 @@ out_rmdir:
 static int umount_device(struct discover_device *dev)
 {
 	int status;
-	pid_t pid;
 
 	if (!dev->mount_path)
 		return 0;
 
-	pid = fork();
-	if (pid == -1) {
-		pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
-		return -1;
-	}
-
-	if (pid == 0) {
-		execl(pb_system_apps.umount, pb_system_apps.umount,
-						dev->mount_path, NULL);
-		exit(EXIT_FAILURE);
-	}
-
-	if (waitpid(pid, &status, 0) == -1) {
-		pb_log("%s: waitpid failed: %s\n", __func__,
-				strerror(errno));
-		return -1;
-	}
+	status = process_run_simple(dev, pb_system_apps.umount,
+			dev->mount_path, NULL);
 
 	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
 		return -1;
@@ -274,7 +258,7 @@ static int umount_device(struct discover_device *dev)
 }
 
 struct device_handler *device_handler_init(struct discover_server *server,
-		int dry_run)
+		struct waitset *waitset, int dry_run)
 {
 	struct device_handler *handler;
 
@@ -282,7 +266,10 @@ struct device_handler *device_handler_init(struct discover_server *server,
 	handler->devices = NULL;
 	handler->n_devices = 0;
 	handler->server = server;
+	handler->waitset = waitset;
 	handler->dry_run = dry_run;
+	handler->default_boot_option = NULL;
+	handler->autoboot_enabled = config_get()->autoboot_enabled;
 	list_init(&handler->unresolved_boot_options);
 
 	/* set up our mount point base */
@@ -373,6 +360,73 @@ static void device_handler_remove(struct device_handler *handler,
 	talloc_free(device);
 }
 
+static void boot_status(void *arg, struct boot_status *status)
+{
+	struct device_handler *handler = arg;
+
+	discover_server_notify_boot_status(handler->server, status);
+}
+
+static void countdown_status(struct device_handler *handler,
+		struct discover_boot_option *opt, unsigned int sec)
+{
+	struct boot_status status;
+
+	status.type = BOOT_STATUS_INFO;
+	status.progress = -1;
+	status.detail = NULL;
+	status.message = talloc_asprintf(handler,
+			"Booting %s in %u sec", opt->option->name, sec);
+
+	discover_server_notify_boot_status(handler->server, &status);
+
+	talloc_free(status.message);
+}
+
+static int default_timeout(void *arg)
+{
+	struct device_handler *handler = arg;
+	struct discover_boot_option *opt;
+
+	if (!handler->default_boot_option)
+		return 0;
+
+	opt = handler->default_boot_option;
+
+	if (handler->sec_to_boot) {
+		countdown_status(handler, opt, handler->sec_to_boot);
+		handler->sec_to_boot--;
+		handler->timeout_waiter = waiter_register_timeout(
+						handler->waitset, 1000,
+						default_timeout, handler);
+		return 0;
+	}
+
+	pb_log("Timeout expired, booting default option %s\n", opt->option->id);
+
+	boot(handler, handler->default_boot_option, NULL,
+			handler->dry_run, boot_status, handler);
+	return 0;
+}
+
+static void set_default(struct device_handler *handler,
+		struct discover_boot_option *opt)
+{
+	if (handler->default_boot_option)
+		return;
+
+	if (!handler->autoboot_enabled)
+		return;
+
+	handler->default_boot_option = opt;
+	handler->sec_to_boot = DEFAULT_BOOT_TIMEOUT_SEC;
+
+	pb_log("Boot option %s set as default, timeout %u sec.\n",
+	       opt->option->id, handler->sec_to_boot);
+
+	default_timeout(handler);
+}
+
 static bool resource_is_resolved(struct resource *res)
 {
 	return !res || res->resolved;
@@ -385,6 +439,7 @@ static bool __attribute__((used)) boot_option_is_resolved(
 {
 	return resource_is_resolved(opt->boot_image) &&
 		resource_is_resolved(opt->initrd) &&
+		resource_is_resolved(opt->dtb) &&
 		resource_is_resolved(opt->icon);
 }
 
@@ -409,16 +464,19 @@ static bool boot_option_resolve(struct discover_boot_option *opt,
 {
 	return resource_resolve(opt->boot_image, "boot_image", opt, handler) &&
 		resource_resolve(opt->initrd, "initrd", opt, handler) &&
+		resource_resolve(opt->dtb, "dtb", opt, handler) &&
 		resource_resolve(opt->icon, "icon", opt, handler);
 }
 
-static void boot_option_finalise(struct discover_boot_option *opt)
+static void boot_option_finalise(struct device_handler *handler,
+		struct discover_boot_option *opt)
 {
 	assert(boot_option_is_resolved(opt));
 
 	/* check that the parsers haven't set any of the final data */
 	assert(!opt->option->boot_image_file);
 	assert(!opt->option->initrd_file);
+	assert(!opt->option->dtb_file);
 	assert(!opt->option->icon_file);
 	assert(!opt->option->device_id);
 
@@ -426,10 +484,15 @@ static void boot_option_finalise(struct discover_boot_option *opt)
 		opt->option->boot_image_file = opt->boot_image->url->full;
 	if (opt->initrd)
 		opt->option->initrd_file = opt->initrd->url->full;
+	if (opt->dtb)
+		opt->option->dtb_file = opt->dtb->url->full;
 	if (opt->icon)
 		opt->option->icon_file = opt->icon->url->full;
 
 	opt->option->device_id = opt->device->device->id;
+
+	if (opt->option->is_default)
+		set_default(handler, opt);
 }
 
 static void process_boot_option_queue(struct device_handler *handler)
@@ -450,7 +513,7 @@ static void process_boot_option_queue(struct device_handler *handler)
 		list_remove(&opt->list);
 		list_add_tail(&opt->device->boot_options, &opt->list);
 		talloc_steal(opt->device, opt);
-		boot_option_finalise(opt);
+		boot_option_finalise(handler, opt);
 		discover_server_notify_boot_option_add(handler->server,
 							opt->option);
 	}
@@ -502,7 +565,7 @@ static void context_commit(struct device_handler *handler,
 					opt->option->id);
 			list_add_tail(&dev->boot_options, &opt->list);
 			talloc_steal(dev, opt);
-			boot_option_finalise(opt);
+			boot_option_finalise(handler, opt);
 			discover_server_notify_boot_option_add(handler->server,
 								opt->option);
 		} else {
@@ -704,13 +767,6 @@ int device_handler_event(struct device_handler *handler,
 	return handlers[event->type][event->action](handler, event);
 }
 
-static void boot_status(void *arg, struct boot_status *status)
-{
-	struct device_handler *handler = arg;
-
-	discover_server_notify_boot_status(handler->server, status);
-}
-
 static struct discover_boot_option *find_boot_option_by_id(
 		struct device_handler *handler, const char *id)
 {
@@ -737,4 +793,30 @@ void device_handler_boot(struct device_handler *handler,
 
 	boot(handler, opt, cmd, handler->dry_run, boot_status, handler);
 }
+
+void device_handler_cancel_default(struct device_handler *handler)
+{
+	struct boot_status status;
+
+	if (handler->timeout_waiter)
+		waiter_remove(handler->timeout_waiter);
+
+	handler->timeout_waiter = NULL;
+	handler->autoboot_enabled = false;
+
+	/* we only send status if we had a default boot option queued */
+	if (!handler->default_boot_option)
+		return;
+
+	pb_log("Cancelling default boot option\n");
+
+	handler->default_boot_option = NULL;
+
+	status.type = BOOT_STATUS_INFO;
+	status.progress = -1;
+	status.detail = NULL;
+	status.message = "Default boot cancelled";
+
+	discover_server_notify_boot_status(handler->server, &status);
+}
 #endif