X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=f1a392f4edca19e66762b51f8817d5b7bd89d045;hb=6d2a87621073b00bb9d6c1fb1c7c8837d85d6bc3;hp=ec4a6f611ff289ee9d4bc61182401897c41ff1ba;hpb=d1a05f13624f81902bcf8007db5d21459067f414;p=petitboot

diff --git a/discover/device-handler.c b/discover/device-handler.c
index ec4a6f6..f1a392f 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -312,6 +312,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)
 {
@@ -336,6 +352,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);
@@ -385,6 +403,8 @@ void device_handler_reinit(struct device_handler *handler)
 	handler->ramdisks = NULL;
 	handler->n_ramdisks = 0;
 
+	set_env_variables(config_get());
+
 	device_handler_reinit_sources(handler);
 }