- get rid of dnsdomainname output errors

- fix double `-l' option in init script ("illegal repeated flag")

diff --git a/dnsmasq.init b/dnsmasq.init
index c744ab2b24ca61cc9ea0f28228fba46b5c34790d..2d3a60a173825c4f191f6708b9d66ddf5afb5ab0 100644 (file)
--- a/dnsmasq.init
+++ b/dnsmasq.init
@@ -31,8 +31,8 @@ fi
 
 MAILHOSTNAME=""
 RESOLV_CONF=""
-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
-DOMAIN_SUFFIX=`dnsdomainname`
+DHCP_LEASE=""
+DOMAIN_SUFFIX=`dnsdomainname 2>/dev/null`
 OPTIONS=""
 
 # Get service config

diff --git a/dnsmasq.sysconfig b/dnsmasq.sysconfig
index 62b37b48d2a32e020a8369e53b5b1960aa284e00..ee7fbb33d8c45a9fdd4317277e9b97d3b60b9d34 100644 (file)
--- a/dnsmasq.sysconfig
+++ b/dnsmasq.sysconfig
@@ -2,6 +2,6 @@
 
 # you can specify options for dnsmasq here
 
-# change '-l /var/lib/misc/dhcpd.leases' option if you want dnsmasq to cache any
+# change '/var/lib/misc/dhcpd.leases' option if you want dnsmasq to cache any
 # "hostname" or "client-hostname" from a dhcpd's lease file
-OPTIONS="-l /var/lib/misc/dhcpd.leases"
+DHCP_LEASE="/var/lib/misc/dhcpd.leases"