#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>
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)
{
if (config_get()->safe_mode)
return handler;
+ set_env_variables(config_get());
+
rc = device_handler_init_sources(handler);
if (rc) {
talloc_free(handler);
{
struct discover_boot_option *opt, *tmp;
struct ramdisk_device *ramdisk;
+ struct config *config;
unsigned int i;
device_handler_cancel_default(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);
}
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)
if (!handler->udev)
return -1;
- handler->user_event = user_event_init(handler, handler->waitset);
- if (!handler->user_event)
- return -1;
-
return 0;
}