From ebe93f43ca999e0e73f6785e847fffd00d2cc511 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 19 Apr 2009 16:06:57 +0000 Subject: [PATCH] [PATCH] ahcpd: fix ticket 3550 Signed-off-by: Gabriel Kerneis SVN-Revision: 15266 --- ipv6/ahcpd/Makefile | 2 +- ipv6/ahcpd/files/ahcpd.config | 1 - ipv6/ahcpd/files/ahcpd.init | 10 ++++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ipv6/ahcpd/Makefile b/ipv6/ahcpd/Makefile index a983d32ee9..870d8bab83 100644 --- a/ipv6/ahcpd/Makefile +++ b/ipv6/ahcpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ahcpd PKG_VERSION:=0.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ diff --git a/ipv6/ahcpd/files/ahcpd.config b/ipv6/ahcpd/files/ahcpd.config index 4aca869712..58db58bc5b 100755 --- a/ipv6/ahcpd/files/ahcpd.config +++ b/ipv6/ahcpd/files/ahcpd.config @@ -1,5 +1,4 @@ config ahcpd option interfaces "wl0" - # Comment out to actually disable, see ticket 3550 option no_dns false option no_ipv4 true diff --git a/ipv6/ahcpd/files/ahcpd.init b/ipv6/ahcpd/files/ahcpd.init index a885c5477b..efd80d3c42 100644 --- a/ipv6/ahcpd/files/ahcpd.init +++ b/ipv6/ahcpd/files/ahcpd.init @@ -7,8 +7,8 @@ pidfile=/var/run/ahcpd.pid ahcpd_config() { local cfg="$1" config_get interfaces "$cfg" interfaces - config_get no_ipv4 "$cfg" no_ipv4 - config_get no_dns "$cfg" no_dns + config_get_bool no_ipv4 "$cfg" no_ipv4 0 + config_get_bool no_dns "$cfg" no_dns 0 } start() { @@ -16,6 +16,12 @@ start() { config_foreach ahcpd_config ahcpd mkdir -p /var/lib [ -r /usr/lib/ahcp/ahcp.dat ] && authority="-a /usr/lib/ahcp/ahcp.dat" + if [ "$no_ipv4" -eq 0 ]; then + unset no_ipv4 + fi + if [ "$no_dns" -eq 0 ]; then + unset no_dns + fi if [ -e $pidfile ] ; then echo "$pidfile exists -- not starting ahcpd." >&2 else -- 2.30.2