summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/system.inc18
1 files changed, 2 insertions, 16 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 88bf7e3..2796354 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -60,29 +60,15 @@ function system_resolvconf_generate($dynupdate = false) {
}
fclose($nfd);
}
- $nfd = @fopen("{$g['varetc_path']}/defaultdomain.conf", "r");
- if ($nfd and $havedns) {
- while (!feof($nfd)) {
- $dnss = trim(fgets($nfd));
- if ($dnss) {
- $resolvconf .= "search $dnss\n";
- }
- }
- fclose($nfd);
- }
}
if (!$havedns && is_array($syscfg['dnsserver'])) {
foreach ($syscfg['dnsserver'] as $ns) {
- if ($ns) {
-
+ if ($ns)
$resolvconf .= "nameserver $ns\n";
- $havedns = true;
- }
+ $havedns = true;
}
}
- $ns = str_replace("nameserver nameserver ", "nameserver ", $resolvconf);
-
fwrite($fd, $resolvconf);
fclose($fd);
OpenPOWER on IntegriCloud