summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2008-02-19 04:48:03 +0000
committerScott Ullrich <sullrich@pfsense.org>2008-02-19 04:48:03 +0000
commit8fb67752dd480bd773150b1304c7468b5fd91869 (patch)
tree92ae710ae279cdcf3ae188fe4e727a1f17b78aaf /etc/inc/config.inc
parent89fcabc4af4c425e0477bec459fac31b185fb420 (diff)
downloadpfsense-8fb67752dd480bd773150b1304c7468b5fd91869.zip
pfsense-8fb67752dd480bd773150b1304c7468b5fd91869.tar.gz
Unset the DHCP LAN subnet information when the interface is removed.
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r--etc/inc/config.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 9822f86..04afef0 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1490,7 +1490,8 @@ EOD;
if($lanif == "") {
if($g['minimum_nic_count'] < 2) {
- unset($config['interfaces']['lan']);
+ unset($config['interfaces']['lan']);
+ unset($config['dhcpd']['lan']);
break;
} else {
fclose($fp);
@@ -1616,7 +1617,7 @@ EOD;
for (; isset($config['interfaces']['opt' . ($i+1)]); $i++)
unset($config['interfaces']['opt' . ($i+1)]);
- echo "Writing configuration...";
+ echo "\nWriting configuration...";
write_config();
echo "done.\n";
@@ -1739,7 +1740,8 @@ function system_start_ftp_helpers() {
require_once("interfaces.inc");
global $config, $g;
- mwexec("/usr/bin/killall ftpsesame");
+ if(isvalidproc("ftpsesame"))
+ mwexec("/usr/bin/killall ftpsesame");
/* build an array of interfaces to work with */
$iflist = array("lan" => "lan");
OpenPOWER on IntegriCloud