X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=11fb115293fcd44076ac30cee7e695a4d7dc7e49;hb=bad9baa8794ed0c31b7f93b110815d98db7b2d7a;hp=a6dbf63e88a07635575e93c24473d3fd24eed9c5;hpb=d2d7d2911c4d97edd31f6596365e6c5249768a99;p=petitboot

diff --git a/discover/device-handler.c b/discover/device-handler.c
index a6dbf63..11fb115 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -13,6 +13,7 @@
 #include <log/log.h>
 #include <types/types.h>
 #include <system/system.h>
+#include <process/process.h>
 #include <url/url.h>
 
 #include "device-handler.h"
@@ -33,7 +34,7 @@ struct device_handler {
 
 	struct waitset		*waitset;
 	struct waiter		*timeout_waiter;
-	bool			default_enabled;
+	bool			autoboot_enabled;
 	unsigned int		sec_to_boot;
 
 	struct discover_boot_option *default_boot_option;
@@ -207,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;
@@ -220,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;
 }
@@ -250,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;
@@ -293,7 +269,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
 	handler->waitset = waitset;
 	handler->dry_run = dry_run;
 	handler->default_boot_option = NULL;
-	handler->default_enabled = config_get()->autoboot_enabled;
+	handler->autoboot_enabled = config_get()->autoboot_enabled;
 	list_init(&handler->unresolved_boot_options);
 
 	/* set up our mount point base */
@@ -328,6 +304,27 @@ static struct discover_device *find_device(struct device_handler *handler,
 	return NULL;
 }
 
+static enum device_type event_device_type(struct device *device,
+		struct event *event)
+{
+	const char *param;
+
+	param = event_get_param(event, "type");
+	if (!param) {
+		pb_log("%s: empty type\n", device->id);
+		return DEVICE_TYPE_UNKNOWN;
+	}
+
+	if (!strcmp(param, "disk") || !strcmp(param, "partition"))
+		return DEVICE_TYPE_DISK;
+
+	if (!strcmp(param, "net"))
+		return DEVICE_TYPE_NETWORK;
+
+	pb_log("%s: unknown type '%s'\n", device->id, param);
+	return DEVICE_TYPE_UNKNOWN;
+}
+
 static struct discover_device *discover_device_create(
 		struct device_handler *handler,
 		struct discover_context *ctx,
@@ -349,6 +346,7 @@ static struct discover_device *discover_device_create(
 		dev->device_path = talloc_strdup(dev, devname);
 
 	dev->device->id = talloc_strdup(dev, event->device);
+	dev->device->type = event_device_type(dev->device, event);
 
 	talloc_set_destructor(dev, destroy_device);
 
@@ -400,7 +398,7 @@ static void countdown_status(struct device_handler *handler,
 	status.progress = -1;
 	status.detail = NULL;
 	status.message = talloc_asprintf(handler,
-			"Booting %s in %d sec", opt->option->name, sec);
+			"Booting %s in %u sec", opt->option->name, sec);
 
 	discover_server_notify_boot_status(handler->server, &status);
 
@@ -439,13 +437,15 @@ static void set_default(struct device_handler *handler,
 	if (handler->default_boot_option)
 		return;
 
-	if (!handler->default_enabled)
+	if (!handler->autoboot_enabled)
 		return;
 
-	pb_log("Boot option %s set as default\n", opt->option->id);
-
 	handler->default_boot_option = opt;
-	handler->sec_to_boot = DEFAULT_BOOT_TIMEOUT_SEC;
+	handler->sec_to_boot = config_get()->autoboot_timeout_sec;
+
+	pb_log("Boot option %s set as default, timeout %u sec.\n",
+	       opt->option->id, handler->sec_to_boot);
+
 	default_timeout(handler);
 }
 
@@ -824,7 +824,7 @@ void device_handler_cancel_default(struct device_handler *handler)
 		waiter_remove(handler->timeout_waiter);
 
 	handler->timeout_waiter = NULL;
-	handler->default_enabled = false;
+	handler->autoboot_enabled = false;
 
 	/* we only send status if we had a default boot option queued */
 	if (!handler->default_boot_option)