From 047ec6c390468ad3102f5725e9cebb40b7d81524 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 1 Feb 2008 20:51:06 +0000 Subject: [PATCH] dnsmasq now looks at /etc/plc_resolv.conf for its upstream dns servers. These upstream servers either come from the original /etc/resolv.conf or given data provided at plc-config-tty time specifying the appropriate dns servers. --- dns-config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dns-config b/dns-config index 3941bbf..f34939b 100755 --- a/dns-config +++ b/dns-config @@ -77,6 +77,7 @@ def main(): # Write /etc/plc_hosts plc_hosts = open("/etc/plc_hosts", "w") + plc_hosts.write("# DO NOT EDIT; File is writen and removed by automatic scripts\n") for ip, hostnames in hosts.iteritems(): plc_hosts.write(ip + "\t" + " ".join(hostnames) + "\n") plc_hosts.close() @@ -92,6 +93,7 @@ def main(): domain-needed bogus-priv addn-hosts=/etc/plc_hosts +resolv-file=/etc/plc_resolv.conf """.lstrip()) # Reload dnsmasq -- 2.43.0