discover/device-handler: Disable safe mode warning on reinit

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 0c0a9a78818bed53c0596390b927ebd571704e98..4e1b3ca77fc0f447bfd0febfdf66db22c7121ed6 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -18,6 +18,7 @@
 #include <process/process.h>
 #include <url/url.h>
 #include <i18n/i18n.h>
+#include <pb-config/pb-config.h>
 
 #include <sys/sysmacros.h>
 #include <sys/types.h>
@@ -87,6 +88,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 +339,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 +379,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 +394,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 +440,16 @@ 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);
+       }
+
        device_handler_reinit_sources(handler);
 }
 
@@ -1406,6 +1437,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
 
 /**
@@ -1507,6 +1593,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 +1606,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;
 }