Since r31182, dnsmasq is configured by a configuration file at /var/etc/dnsmasq.conf generated by dnsmasq's start script from its UCI configuration. It is no longer configured by command-line arguments. dnsmasq is started by telling it (via the -C option) to use /var/etc/dnsmasq.conf as its configuration file. As such, it never consults /etc/dnsmasq.conf.
/etc/dnsmasq.conf was added in r17663 when dnsmasq was still configured by command-line arguments as an example file and location to place options too cumbersome to put on the command line. Because this file will no longer be consulted, it is obsolete and should be removed from the dnsmasq package. Signed-off-by: Mark Mentovai <[email protected]> --- Index: package/dnsmasq/Makefile =================================================================== --- package/dnsmasq/Makefile (revision 31782) +++ package/dnsmasq/Makefile (working copy) @@ -32,7 +32,6 @@ define Package/dnsmasq/conffiles /etc/config/dhcp -/etc/dnsmasq.conf endef TARGET_CFLAGS += \ @@ -50,7 +49,6 @@ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnsmasq $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DATA) ./files/dhcp.conf $(1)/etc/config/dhcp - $(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq endef Index: package/dnsmasq/files/dnsmasq.conf =================================================================== --- package/dnsmasq/files/dnsmasq.conf (revision 31782) +++ package/dnsmasq/files/dnsmasq.conf (working copy) @@ -1,37 +0,0 @@ -# Change the following lines if you want dnsmasq to serve SRV -# records. -# You may add multiple srv-host lines. -# The fields are <name>,<target>,<port>,<priority>,<weight> - -# A SRV record sending LDAP for the example.com domain to -# ldapserver.example.com port 289 -#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389 - -# Two SRV records for LDAP, each with different priorities -#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,1 -#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,2 - -# A SRV record indicating that there is no LDAP server for the domain -# example.com -#srv-host=_ldap._tcp.example.com - -# The following line shows how to make dnsmasq serve an arbitrary PTR -# record. This is useful for DNS-SD. -# The fields are <name>,<target> -#ptr-record=_http._tcp.dns-sd-services,"New Employee Page._http._tcp.dns-sd-services" - -# Change the following lines to enable dnsmasq to serve TXT records. -# These are used for things like SPF and zeroconf. -# The fields are <name>,<text>,<text>... - -#Example SPF. -#txt-record=example.com,"v=spf1 a -all" - -#Example zeroconf -#txt-record=_http._tcp.example.com,name=value,paper=A4 - -# Provide an alias for a "local" DNS name. Note that this _only_ works -# for targets which are names from DHCP or /etc/hosts. Give host -# "bert" another name, bertrand -# The fields are <cname>,<target> -#cname=bertand,bert _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
