X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=7a84302b71314104b74309c3167abe5314d017b2;hp=d2a3f16757ed9433baaee15d207667190ea33634;hb=e52b37c27c267c882d82cd1e34412817b5a4dbce;hpb=c11bcba9a99e858e618f4d872a5be7d52dcaaa5a diff --git a/discover/device-handler.c b/discover/device-handler.c index d2a3f16..7a84302 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -7,11 +7,13 @@ #include #include +#include #include #include #include #include #include +#include #include #include "device-handler.h" @@ -32,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; @@ -84,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); @@ -128,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); - - dev = device_lookup_by_path(handler, path); + if (!strncmp(name, "/dev/", strlen("/dev/"))) + name += strlen("/dev/"); - 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( @@ -206,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; @@ -219,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)) { + 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; } @@ -249,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; @@ -292,7 +248,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 = true; + handler->autoboot_enabled = config_get()->autoboot_enabled; list_init(&handler->unresolved_boot_options); /* set up our mount point base */ @@ -327,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) @@ -343,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); @@ -399,7 +377,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); @@ -438,13 +416,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); } @@ -823,7 +803,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)