X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=aa61bd25ae92eb7fc28d0b0bc8e3177fb368f9b4;hp=0c0a9a78818bed53c0596390b927ebd571704e98;hb=6d06f0dbe1195cd8be7d3c54d02012ff16466d0c;hpb=ff54a215f0ce4c25262b24038841b58274cc51d3 diff --git a/discover/device-handler.c b/discover/device-handler.c index 0c0a9a7..aa61bd2 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -18,6 +19,7 @@ #include #include #include +#include #include #include @@ -87,6 +89,7 @@ struct device_handler { struct plugin_option **plugins; unsigned int n_plugins; + bool plugin_installing; }; static int mount_device(struct discover_device *dev); @@ -337,6 +340,22 @@ const char *discover_device_get_param(struct discover_device *device, return NULL; } +static void set_env_variables(const struct config *config) +{ + if (config->http_proxy) + setenv("http_proxy", config->http_proxy, 1); + else + unsetenv("http_proxy"); + + if (config->https_proxy) + setenv("https_proxy", config->https_proxy, 1); + else + unsetenv("https_proxy"); + + /* Reduce noise in the log from LVM listing open file descriptors */ + setenv("LVM_SUPPRESS_FD_WARNINGS", "1", 1); +} + struct device_handler *device_handler_init(struct discover_server *server, struct waitset *waitset, int dry_run) { @@ -361,6 +380,8 @@ struct device_handler *device_handler_init(struct discover_server *server, if (config_get()->safe_mode) return handler; + set_env_variables(config_get()); + rc = device_handler_init_sources(handler); if (rc) { talloc_free(handler); @@ -374,6 +395,7 @@ void device_handler_reinit(struct device_handler *handler) { struct discover_boot_option *opt, *tmp; struct ramdisk_device *ramdisk; + struct config *config; unsigned int i; device_handler_cancel_default(handler); @@ -419,6 +441,19 @@ void device_handler_reinit(struct device_handler *handler) discover_server_notify_plugins_remove(handler->server); + set_env_variables(config_get()); + + /* If the safe mode warning was active disable it now */ + if (config_get()->safe_mode) { + config = config_copy(handler, config_get()); + config->safe_mode = false; + config_set(config); + discover_server_notify_config(handler->server, config); + } + + /* Force rediscovery on SCSI devices */ + process_run_simple(handler, pb_system_apps.scsi_rescan, NULL); + device_handler_reinit_sources(handler); } @@ -622,7 +657,7 @@ void device_handler_status_download(struct device_handler *handler, unit++; } update = talloc_asprintf(handler, - _("%u %s downloading: %.0f%% - %lu%cB"), + _("%u %s downloading: %.0f%% - %" PRIu64 "%cB"), handler->n_progress, ngettext("item", "items", handler->n_progress), (current / total) * 100, current_converted, @@ -800,6 +835,9 @@ static enum default_priority default_option_priority( int boot_match = autoboot_option_priority(config, opt); if (boot_match > 0) return boot_match; + } else { + /* If there is no specific boot order, boot any device */ + return DEFAULT_PRIORITY_LOCAL_FIRST; } /* If the option didn't match any entry in the array, it is disabled */ @@ -1325,7 +1363,7 @@ static void process_url_cb(struct load_url_result *result, void *data) mac = event_get_param(event, "mac"); char *url = talloc_asprintf(event, "file://%s", result->local); - event_set_param(event, "pxeconffile", url); + event_set_param(event, "pxeconffile-local", url); dev = discover_device_create(handler, mac, event->device); ctx = device_handler_discover_context_create(handler, dev); @@ -1406,6 +1444,61 @@ void device_handler_process_url(struct device_handler *handler, talloc_unlink(handler, ctx); } +static void plugin_install_cb(struct process *process) +{ + struct device_handler *handler = process->data; + + if (!handler) { + pb_log("%s: Missing data!\n", __func__); + return; + } + + handler->plugin_installing = false; + if (process->exit_status) { + device_handler_status_err(handler, "Plugin failed to install!"); + pb_log("Failed to install plugin:\n%s\n", process->stdout_buf); + } +} + +void device_handler_install_plugin(struct device_handler *handler, + const char *plugin_file) +{ + struct process *p; + int result; + + if (handler->plugin_installing) { + pb_log("Plugin install cancelled - install already running"); + return; + } + + p = process_create(handler); + if (!p) { + pb_log("install_plugin: Failed to create process\n"); + return; + } + + const char *argv[] = { + pb_system_apps.pb_plugin, + "install", + "auto", + plugin_file, + NULL + }; + + p->path = pb_system_apps.pb_plugin; + p->argv = argv; + p->exit_cb = plugin_install_cb; + p->data = handler; + p->keep_stdout = true; + + result = process_run_async(p); + + if (result) + device_handler_status_err(handler, "Could not install plugin"); + else + handler->plugin_installing = true; +} + #ifndef PETITBOOT_TEST /** @@ -1470,8 +1563,7 @@ void device_handler_add_plugin_option(struct device_handler *handler, tmp = handler->plugins[i]; /* If both id and version match, ignore */ if (strncmp(opt->id, tmp->id, strlen(opt->id)) == 0 && - strncmp(opt->version, tmp->version, - strlen(opt->version) == 0)) { + strcmp(opt->version, tmp->version) == 0) { pb_log("discover: Plugin '%s' already exists, ignoring\n", opt->id); return; @@ -1507,6 +1599,10 @@ static void device_handler_update_lang(const char *lang) static int device_handler_init_sources(struct device_handler *handler) { /* init our device sources: udev, network and user events */ + handler->user_event = user_event_init(handler, handler->waitset); + if (!handler->user_event) + return -1; + handler->network = network_init(handler, handler->waitset, handler->dry_run); if (!handler->network) @@ -1516,10 +1612,6 @@ static int device_handler_init_sources(struct device_handler *handler) if (!handler->udev) return -1; - handler->user_event = user_event_init(handler, handler->waitset); - if (!handler->user_event) - return -1; - return 0; } @@ -1706,6 +1798,20 @@ static int mount_device(struct discover_device *dev) rc = try_mount(device_path, dev->mount_path, fstype, MS_RDONLY | MS_SILENT, dev->ramdisk); + /* If mount fails clean up any snapshot and try again */ + if (rc && dev->ramdisk) { + pb_log("couldn't mount snapshot for %s: mount failed: %s\n", + device_path, strerror(errno)); + pb_log("falling back to actual device\n"); + + devmapper_destroy_snapshot(dev); + + device_path = get_device_path(dev); + pb_log("mounting device %s read-only\n", dev->device_path); + rc = try_mount(device_path, dev->mount_path, fstype, + MS_RDONLY | MS_SILENT, dev->ramdisk); + } + if (!rc) { dev->mounted = true; dev->mounted_rw = false; @@ -1717,9 +1823,6 @@ static int mount_device(struct discover_device *dev) pb_log("couldn't mount device %s: mount failed: %s\n", device_path, strerror(errno)); - /* If mount fails clean up any snapshot */ - devmapper_destroy_snapshot(dev); - pb_rmdir_recursive(mount_base(), dev->mount_path); err_free: talloc_free(dev->mount_path);