X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=ed5733eb6166f79d7a7dac2d802df8811381cdd1;hp=a4b955ef6fd48e3c2daa72cf2696b4e6f9f8159d;hb=aa23987dd043f7c8bea5a48bd9476a4ca1620069;hpb=8ed97667e4c602ef37cb2a870a198cfbf008b29a

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index a4b955e..ed5733e 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -25,7 +25,7 @@
 static const char *partition = "common";
 static const char *sysparams_dir = "/sys/firmware/opal/sysparams/";
 static const char *devtree_dir = "/proc/device-tree/";
-static const int ipmi_timeout = 5000; /* milliseconds. */
+static const int ipmi_timeout = 10000; /* milliseconds. */
 
 struct param {
 	char			*name;
@@ -492,19 +492,6 @@ static void populate_bootdev_config(struct platform_powerpc *platform,
 	config->n_autoboot_opts = n_new;
 }
 
-static void set_proxy_variables(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");
-}
-
 static void populate_config(struct platform_powerpc *platform,
 		struct config *config)
 {
@@ -560,7 +547,6 @@ static void populate_config(struct platform_powerpc *platform,
 	val = get_param(platform, "petitboot,https_proxy");
 	if (val)
 		config->https_proxy = talloc_strdup(config, val);
-	set_proxy_variables(config);
 }
 
 static char *iface_config_str(void *ctx, struct interface_config *config)
@@ -740,7 +726,6 @@ static int update_config(struct platform_powerpc *platform,
 	update_string_config(platform, "petitboot,http_proxy", val);
 	val = config->https_proxy ?: "";
 	update_string_config(platform, "petitboot,https_proxy", val);
-	set_proxy_variables(config);
 
 	update_network_config(platform, config);