summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-08-12 11:46:58 +0000
committerErmal <eri@pfsense.org>2011-08-12 11:47:12 +0000
commit6c86a39f8efc2906f53dafe57b304ed8b3241e84 (patch)
tree00885ffabe8c88272fb729943e075eb567192f34 /etc
parentf61dc8e6d638949866fdcb61c05c9d5905a48a80 (diff)
downloadpfsense-6c86a39f8efc2906f53dafe57b304ed8b3241e84.zip
pfsense-6c86a39f8efc2906f53dafe57b304ed8b3241e84.tar.gz
Allow disabling having localhost in resolv.conf. There are some special setups that might need this.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/system.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index c8f13d2..aad98e4 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -90,7 +90,8 @@ function system_resolvconf_generate($dynupdate = false) {
if($syscfg['domain'])
$resolvconf = "domain {$syscfg['domain']}\n";
- $resolvconf .= "nameserver 127.0.0.1\n";
+ if (!isset($config['system']['dnslocalhost']))
+ $resolvconf .= "nameserver 127.0.0.1\n";
if (isset($syscfg['dnsallowoverride'])) {
/* get dynamically assigned DNS servers (if any) */
OpenPOWER on IntegriCloud