diff options
| author | Chris Buechler <cmb@pfsense.org> | 2008-04-21 01:00:10 +0000 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2008-04-21 01:00:10 +0000 |
| commit | c0d63576604ba3a02e7f5d2891ef710de40802b8 (patch) | |
| tree | ac6acf981a86368914c507cde9e667bc6b19300a /etc/inc/config.inc | |
| parent | 9bc9ae83aa5b65c66c8a1b2c262e07081c533b86 (diff) | |
| download | pfsense-c0d63576604ba3a02e7f5d2891ef710de40802b8.zip pfsense-c0d63576604ba3a02e7f5d2891ef710de40802b8.tar.gz | |
don't prompt to remove LAN config if booting (you likely never assigned one, just remove it)
fix error when unset config items don't exist
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index c167caf..2a760d2 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1639,7 +1639,7 @@ EOD; if (strcasecmp(chop(fgets($fp)), "y") == 0) { if($lanif) { $config['interfaces']['lan']['if'] = $lanif; - } else { + } elseif (!$g['booting']) { echo <<<EODD @@ -1653,13 +1653,37 @@ EODD; if($config['interfaces']['lan']['if']) mwexec("/sbin/ifconfig delete " . $config['interfaces']['lan']['if']); } - unset($config['interfaces']['lan']); - unset($config['dhcpd']['lan']); - unset($config['interfaces']['lan']['if']); - unset($config['interfaces']['wan']['blockpriv']); - unset($config['shaper']); - unset($config['ezshaper']); - unset($config['nat']); + if($config['interfaces']['lan']) + unset($config['interfaces']['lan']); + if($config['dhcpd']['lan']) + unset($config['dhcpd']['lan']); + if($config['interfaces']['lan']['if']) + unset($config['interfaces']['lan']['if']); + if($config['interfaces']['wan']['blockpriv']) + unset($config['interfaces']['wan']['blockpriv']); + if($config['shaper']) + unset($config['shaper']); + if($config['ezshaper']) + unset($config['ezshaper']); + if($config['nat']) + unset($config['nat']); + } elseif ($g['booting']) { + if($config['interfaces']['lan']['if']) + mwexec("/sbin/ifconfig delete " . $config['interfaces']['lan']['if']); + if($config['interfaces']['lan']) + unset($config['interfaces']['lan']); + if($config['dhcpd']['lan']) + unset($config['dhcpd']['lan']); + if($config['interfaces']['lan']['if']) + unset($config['interfaces']['lan']['if']); + if($config['interfaces']['wan']['blockpriv']) + unset($config['interfaces']['wan']['blockpriv']); + if($config['shaper']) + unset($config['shaper']); + if($config['ezshaper']) + unset($config['ezshaper']); + if($config['nat']) + unset($config['nat']); } if (preg_match($g['wireless_regex'], $lanif)) { if (!is_array($config['interfaces']['lan']['wireless'])) @@ -2092,4 +2116,4 @@ function set_device_perms() { if($g['booting']) echo "."; $config = parse_config(); -?> +?>
\ No newline at end of file |
