X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=ccc7cc3d01dc8ce0d5fa01f5dc885042461af0dc;hb=15c8cadd1173f681142a3f48319a203d7b917850;hp=e991662d6a372eb5e45dc8625b75f0314d1261d9;hpb=2723662cabd4d34d4155ab5d6668c591a20a086b;p=petitboot diff --git a/discover/device-handler.c b/discover/device-handler.c index e991662..ccc7cc3 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; @@ -206,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; @@ -219,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)) { - - /* 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; } @@ -249,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; @@ -292,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 = true; + handler->autoboot_enabled = config_get()->autoboot_enabled; list_init(&handler->unresolved_boot_options); /* set up our mount point base */ @@ -399,7 +376,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); @@ -425,6 +402,8 @@ static int default_timeout(void *arg) 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; @@ -436,11 +415,15 @@ static void set_default(struct device_handler *handler, if (handler->default_boot_option) return; - if (!handler->default_enabled) + 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); } @@ -456,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); } @@ -480,6 +464,7 @@ 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); } @@ -491,6 +476,7 @@ static void boot_option_finalise(struct device_handler *handler, /* 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); @@ -498,6 +484,8 @@ static void boot_option_finalise(struct device_handler *handler, 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; @@ -814,12 +802,14 @@ 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) return; + pb_log("Cancelling default boot option\n"); + handler->default_boot_option = NULL; status.type = BOOT_STATUS_INFO;