From 59cfe65d3cd4fd3b7208d0503f571759956b9021 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 1 Jun 2010 17:35:27 +0000 Subject: Do not set max_execution time here. --- etc/inc/config.lib.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc/inc/config.lib.inc') diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index 435949f..90968ad 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -359,7 +359,7 @@ function convert_config() { global $config, $g; $now = date("H:i:s"); log_error("Start Configuration upgrade at $now, set execution timeout to 15 minutes"); - ini_set("max_execution_time", "900"); + //ini_set("max_execution_time", "900"); /* special case upgrades */ /* fix every minute crontab bogons entry */ -- cgit v1.1 From d538b8fa7e05f75a457fbdda1072b90f326ee149 Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 2 Jun 2010 17:20:10 +0000 Subject: Correct ifconfig syntax --- etc/inc/config.lib.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc/inc/config.lib.inc') diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index 90968ad..707dee8 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -932,7 +932,7 @@ EODD; if (strcasecmp(chop(fgets($fp)), "y") == 0) { if($config['interfaces']['lan']['if']) - mwexec("/sbin/ifconfig delete " . $config['interfaces']['lan']['if']); + mwexec("/sbin/ifconfig " . $config['interfaces']['lan']['if'] . " delete"); } if(isset($config['interfaces']['lan'])) unset($config['interfaces']['lan']); @@ -950,7 +950,7 @@ EODD; unset($config['nat']); } else { if(isset($config['interfaces']['lan']['if'])) - mwexec("/sbin/ifconfig delete " . $config['interfaces']['lan']['if']); + mwexec("/sbin/ifconfig " . $config['interfaces']['lan']['if'] . " delete"); if(isset($config['interfaces']['lan'])) unset($config['interfaces']['lan']); if(isset($config['dhcpd']['lan'])) -- cgit v1.1