X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=d3256fa58321ee910cb546d282ff5f05ad0de4b9;hp=cd9c41386ea07bdaa9762f75ac3ec81648c5b280;hb=d27570168fd6d5a2144553002c8082ae626b7e84;hpb=b201464a18c990ea6df0f2878e532618d4936c53 diff --git a/discover/device-handler.c b/discover/device-handler.c index cd9c413..d3256fa 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -1,4 +1,3 @@ - #include #include #include @@ -24,6 +23,7 @@ #include "parser.h" #include "resource.h" #include "paths.h" +#include "sysinfo.h" #include "boot.h" struct device_handler { @@ -40,6 +40,9 @@ struct device_handler { struct discover_boot_option *default_boot_option; struct list unresolved_boot_options; + + struct boot_task *pending_boot; + bool pending_boot_is_default; }; static int mount_device(struct discover_device *dev); @@ -276,6 +279,7 @@ struct device_handler *device_handler_init(struct discover_server *server, void device_handler_remove(struct device_handler *handler, struct discover_device *device) { + struct discover_boot_option *opt, *tmp; unsigned int i; for (i = 0; i < handler->n_devices; i++) @@ -287,6 +291,16 @@ void device_handler_remove(struct device_handler *handler, return; } + /* Free any unresolved options, as they're currently allocated + * against the handler */ + list_for_each_entry_safe(&handler->unresolved_boot_options, + opt, tmp, list) { + if (opt->device != device) + continue; + list_remove(&opt->list); + talloc_free(opt); + } + handler->n_devices--; memmove(&handler->devices[i], &handler->devices[i + 1], (handler->n_devices - i) * sizeof(handler->devices[0])); @@ -331,6 +345,9 @@ static int default_timeout(void *arg) if (!handler->default_boot_option) return 0; + if (handler->pending_boot) + return 0; + opt = handler->default_boot_option; if (handler->sec_to_boot) { @@ -346,8 +363,9 @@ static int default_timeout(void *arg) 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); + handler->pending_boot = boot(handler, handler->default_boot_option, + NULL, handler->dry_run, boot_status, handler); + handler->pending_boot_is_default = true; return 0; } @@ -361,7 +379,7 @@ static int default_option_priority(struct discover_boot_option *opt) { const struct config *config; struct boot_priority *prio; - int i; + unsigned int i; config = config_get(); @@ -433,7 +451,7 @@ static bool resource_resolve(struct resource *res, const char *name, if (resource_is_resolved(res)) return true; - pb_log("Attempting to resolve resource %s->%s with parser %s\n", + pb_debug("Attempting to resolve resource %s->%s with parser %s\n", opt->option->id, name, parser->name); parser->resolve_resource(handler, res); @@ -495,13 +513,13 @@ static void process_boot_option_queue(struct device_handler *handler) list_for_each_entry_safe(&handler->unresolved_boot_options, opt, tmp, list) { - pb_log("queue: attempting resolution for %s\n", + pb_debug("queue: attempting resolution for %s\n", opt->option->id); if (!boot_option_resolve(opt, handler)) continue; - pb_log("\tresolved!\n"); + pb_debug("\tresolved!\n"); list_remove(&opt->list); list_add_tail(&opt->device->boot_options, &opt->list); @@ -517,9 +535,8 @@ struct discover_context *device_handler_discover_context_create( { struct discover_context *ctx; - ctx = talloc(handler, struct discover_context); + ctx = talloc_zero(handler, struct discover_context); ctx->device = device; - ctx->conf_url = NULL; list_init(&ctx->boot_options); return ctx; @@ -583,40 +600,47 @@ void device_handler_add_device(struct device_handler *handler, * array, but has only just been initialised by the hotplug source. */ int device_handler_discover(struct device_handler *handler, - struct discover_device *dev, enum conf_method method) + struct discover_device *dev) { struct discover_context *ctx; + int rc; process_boot_option_queue(handler); /* create our context */ ctx = device_handler_discover_context_create(handler, dev); - mount_device(dev); + rc = mount_device(dev); + if (rc) + goto out; + + /* add this device to our system info */ + system_info_register_blockdev(dev->device->id, dev->uuid, + dev->mount_path); /* run the parsers. This will populate the ctx's boot_option list. */ - iterate_parsers(ctx, method); + iterate_parsers(ctx); /* add discovered stuff to the handler */ device_handler_discover_context_commit(handler, ctx); +out: talloc_free(ctx); return 0; } -/* incoming conf event */ -int device_handler_conf(struct device_handler *handler, - struct discover_device *dev, struct pb_url *url, - enum conf_method method) +/* Incoming dhcp event */ +int device_handler_dhcp(struct device_handler *handler, + struct discover_device *dev, struct event *event) { struct discover_context *ctx; /* create our context */ ctx = device_handler_discover_context_create(handler, dev); - ctx->conf_url = url; + ctx->event = event; - iterate_parsers(ctx, method); + iterate_parsers(ctx); device_handler_discover_context_commit(handler, ctx); @@ -625,6 +649,25 @@ int device_handler_conf(struct device_handler *handler, return 0; } +/* incoming conf event */ +int device_handler_conf(struct device_handler *handler, + struct discover_device *dev, struct pb_url *url) +{ + struct discover_context *ctx; + + /* create our context */ + ctx = device_handler_discover_context_create(handler, dev); + ctx->conf_url = url; + + iterate_parsers(ctx); + + device_handler_discover_context_commit(handler, ctx); + + talloc_free(ctx); + + return 0; +} + static struct discover_boot_option *find_boot_option_by_id( struct device_handler *handler, const char *id) { @@ -645,11 +688,16 @@ static struct discover_boot_option *find_boot_option_by_id( void device_handler_boot(struct device_handler *handler, struct boot_command *cmd) { - struct discover_boot_option *opt; + struct discover_boot_option *opt = NULL; - opt = find_boot_option_by_id(handler, cmd->option_id); + if (cmd->option_id && strlen(cmd->option_id)) + opt = find_boot_option_by_id(handler, cmd->option_id); - boot(handler, opt, cmd, handler->dry_run, boot_status, handler); + if (handler->pending_boot) + boot_cancel(handler->pending_boot); + handler->pending_boot = boot(handler, opt, cmd, handler->dry_run, + boot_status, handler); + handler->pending_boot_is_default = false; } void device_handler_cancel_default(struct device_handler *handler) @@ -668,6 +716,12 @@ void device_handler_cancel_default(struct device_handler *handler) pb_log("Cancelling default boot option\n"); + if (handler->pending_boot && handler->pending_boot_is_default) { + boot_cancel(handler->pending_boot); + handler->pending_boot = NULL; + handler->pending_boot_is_default = false; + } + handler->default_boot_option = NULL; status.type = BOOT_STATUS_INFO; @@ -678,6 +732,13 @@ void device_handler_cancel_default(struct device_handler *handler) discover_server_notify_boot_status(handler->server, &status); } +void device_handler_update_config(struct device_handler *handler, + struct config *config) +{ + config_set(config); + discover_server_notify_config(handler->server, config); +} + #ifndef PETITBOOT_TEST static bool check_existing_mount(struct discover_device *dev) { @@ -716,12 +777,15 @@ static bool check_existing_mount(struct discover_device *dev) continue; if (mntstat.st_rdev == devstat.st_rdev) { - pb_debug("%s: %s is already mounted at %s\n" - __func__, dev->device_path, - mnt->mnt_dir); dev->mount_path = talloc_strdup(dev, mnt->mnt_dir); + dev->mounted_rw = !!hasmntopt(mnt, "rw"); dev->mounted = true; dev->unmount = false; + + pb_debug("%s: %s is already mounted (r%c) at %s\n", + __func__, dev->device_path, + dev->mounted_rw ? 'w' : 'o', + mnt->mnt_dir); break; } } @@ -758,6 +822,7 @@ static int mount_device(struct discover_device *dev) "-o", "ro", NULL); if (!rc) { dev->mounted = true; + dev->mounted_rw = false; dev->unmount = true; return 0; } @@ -768,6 +833,7 @@ static int mount_device(struct discover_device *dev) if (!rc) { dev->mounted = true; + dev->mounted_rw = true; dev->unmount = true; return 0; } @@ -793,13 +859,47 @@ static int umount_device(struct discover_device *dev) return -1; dev->mounted = false; + + pb_rmdir_recursive(mount_base(), dev->mount_path); + talloc_free(dev->mount_path); dev->mount_path = NULL; - pb_rmdir_recursive(mount_base(), dev->mount_path); + return 0; +} + +int device_request_write(struct discover_device *dev, bool *release) +{ + int rc; + *release = false; + + if (!dev->mounted) + return -1; + + if (dev->mounted_rw) + return 0; + + rc = process_run_simple(dev, pb_system_apps.mount, dev->mount_path, + "-o", "remount,rw", NULL); + if (rc) + return -1; + + dev->mounted_rw = true; + *release = true; return 0; } + +void device_release_write(struct discover_device *dev, bool release) +{ + if (!release) + return; + + process_run_simple(dev, pb_system_apps.mount, dev->mount_path, + "-o", "remount,ro", NULL); + dev->mounted_rw = false; +} + #else static int umount_device(struct discover_device *dev __attribute__((unused))) @@ -813,5 +913,17 @@ static int __attribute__((unused)) mount_device( return 0; } +int device_request_write(struct discover_device *dev __attribute__((unused)), + bool *release) +{ + *release = true; + return 0; +} + +void device_release_write(struct discover_device *dev __attribute__((unused)), + bool release __attribute__((unused))) +{ +} + #endif