sigh, tabs vs spaces issue I think... attached is a version that applies fine in my trunk. thanks!
2012/10/17 John Crispin <[email protected]> > On 16/10/12 22:04, Jonh Wendell wrote: > >> Signed-off-by: Jonh Wendell <[email protected] >> <mailto:jonh.wendell@oiwifi.**com.br <[email protected]>>> >> >> --- >> .../network/services/dnsmasq/**files/dnsmasq.init | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/package/network/services/**dnsmasq/files/dnsmasq.init >> b/package/network/services/**dnsmasq/files/dnsmasq.init >> index 85c22c3..cb65bef 100644 >> --- a/package/network/services/**dnsmasq/files/dnsmasq.init >> +++ b/package/network/services/**dnsmasq/files/dnsmasq.init >> @@ -133,6 +133,9 @@ dnsmasq() { >> config_get hostsfile "$cfg" dhcphostsfile >> [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" >> >> + config_get confdir "$cfg" conf_dir >> + [ -d "$confdir" ] && xappend "--conf-dir=$confdir" >> + >> local rebind >> config_get_bool rebind "$cfg" rebind_protection 1 >> [ $rebind -gt 0 ] && { >> -- >> 1.7.9.5 >> >> >> -- >> Jonh Wendell >> http://www.bani.com.br >> > > patch fails to apply, please rebase and resend > > error: patch failed: package/network/services/** > dnsmasq/files/dnsmasq.init:133 > error: package/network/services/**dnsmasq/files/dnsmasq.init: patch does > not apply > Patch failed at 0001 Parse the option 'conf_dir' in the init script > ______________________________**_________________ > openwrt-devel mailing list > [email protected].**org <[email protected]> > https://lists.openwrt.org/**mailman/listinfo/openwrt-devel<https://lists.openwrt.org/mailman/listinfo/openwrt-devel> > -- Jonh Wendell http://www.bani.com.br
0001-dnsmasq-Parse-the-option-conf_dir-in-the-init-script.patch
Description: Binary data
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
