discover: Consolidate device path, name and ID.

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index d14e54fd2ec99b5ee46cfa87bf0bc4582c6e6d64..7a84302b71314104b74309c3167abe5314d017b2 100644 (file)
--- 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"
@@ -85,11 +86,6 @@ struct discover_boot_option *discover_boot_option_create(
        return opt;
 }
 
-static int device_match_path(struct discover_device *dev, const char *path)
-{
-       return dev->device_path && !strcmp(dev->device_path, path);
-}
-
 static int device_match_uuid(struct discover_device *dev, const char *uuid)
 {
        return dev->uuid && !strcmp(dev->uuid, uuid);
@@ -129,26 +125,10 @@ static struct discover_device *device_lookup(
 struct discover_device *device_lookup_by_name(struct device_handler *handler,
                const char *name)
 {
-       struct discover_device *dev;
-       char *path;
-
-       if (strncmp(name, "/dev/", strlen("/dev/")))
-               path = talloc_asprintf(NULL, "/dev/%s", name);
-       else
-               path = talloc_strdup(NULL, name);
+       if (!strncmp(name, "/dev/", strlen("/dev/")))
+               name += strlen("/dev/");
 
-       dev = device_lookup_by_path(handler, path);
-
-       talloc_free(path);
-
-       return dev;
-}
-
-struct discover_device *device_lookup_by_path(
-               struct device_handler *device_handler,
-               const char *path)
-{
-       return device_lookup(device_handler, device_match_path, path);
+       return device_lookup_by_id(handler, name);
 }
 
 struct discover_device *device_lookup_by_uuid(
@@ -207,7 +187,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 +200,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)) {
-
-               /* Retry mount without ro option. */
+       rc = process_run_simple(dev, pb_system_apps.mount,
+                       dev->device_path, dev->mount_path,
+                       "-o", "ro", NULL);
 
-               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 +221,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;
@@ -328,13 +283,34 @@ 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,
                struct event *event)
 {
        struct discover_device *dev;
-       const char *devname;
+       const char *devnode;
 
        dev = find_device(handler, event->device);
        if (dev)
@@ -344,11 +320,12 @@ static struct discover_device *discover_device_create(
        dev->device = talloc_zero(dev, struct device);
        list_init(&dev->boot_options);
 
-       devname = event_get_param(ctx->event, "DEVNAME");
-       if (devname)
-               dev->device_path = talloc_strdup(dev, devname);
+       devnode = event_get_param(ctx->event, "node");
+       if (devnode)
+               dev->device_path = talloc_strdup(dev, devnode);
 
        dev->device->id = talloc_strdup(dev, event->device);
+       dev->device->type = event_device_type(dev->device, event);
 
        talloc_set_destructor(dev, destroy_device);
 
@@ -443,7 +420,7 @@ static void set_default(struct device_handler *handler,
                return;
 
        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);