From 3c7eab702c7ee6fce6bf3da21d41e90fb7dca7d8 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 19 Nov 2020 12:35:38 +0000 Subject: [PATCH] enable log-facility + conf-dir on default iface --- includes/dhcp.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/dhcp.php b/includes/dhcp.php index 5f8a0ca7..3f930738 100755 --- a/includes/dhcp.php +++ b/includes/dhcp.php @@ -103,8 +103,11 @@ function SaveDHCPConfig($status) } $config .= PHP_EOL; } - $config .= "log-facility=/tmp/dnsmasq.log".PHP_EOL; - $config .= "conf-dir=/etc/dnsmasq.d".PHP_EOL; + // enable these settings on the default interface + if ($iface == "wlan0") { + $config .= "log-facility=/tmp/dnsmasq.log".PHP_EOL; + $config .= "conf-dir=/etc/dnsmasq.d".PHP_EOL; + } file_put_contents("/tmp/dnsmasqdata", $config); $msg = file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf') ? 'updated' : 'added'; system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $return); @@ -152,9 +155,8 @@ function SaveDHCPConfig($status) } elseif (($_POST['dhcp-iface'] == "0") && file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) { // remove dhcp conf for selected interface $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); - // todo: improve by removing extra blank lines $dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$iface.'.*\n(.*\n){3}/m', '', $dhcp_cfg); - file_put_contents("/tmp/dhcpddata", $dhcp_cfg); + file_put_contents("/tmp/dhcpddata", rtrim($dhcp_cfg).PHP_EOL); system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return); $status->addMessage('DHCP configuration for '.$iface.' removed.', 'success'); // remove dnsmasq eth0 conf