odhcpd: enable ipv6 server mode only when it is supported

Signed-off-by: Rosy Song <[email protected]>
(backported from 918ec4d549cc80b590e50003d0c489c27f864749)

diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile
index 25a3cf564933c54d58ac634694403f1169390e9e..03adf004551861c24b6fc7264cc84884706f2221 100644 (file)
--- a/package/network/services/odhcpd/Makefile
+++ b/package/network/services/odhcpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcpd
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=1.11
 
 PKG_SOURCE_PROTO:=git

diff --git a/package/network/services/odhcpd/files/odhcpd.defaults b/package/network/services/odhcpd/files/odhcpd.defaults
index cecbdd4a8d71523873022a6f6f1d1c849a72a371..2d8a6f0b1a4176d48328f5a8c822336cffb3187d 100644 (file)
--- a/package/network/services/odhcpd/files/odhcpd.defaults
+++ b/package/network/services/odhcpd/files/odhcpd.defaults
@@ -13,7 +13,7 @@ json_select ..
 
 case "$protocol" in
 # only enable server mode on statically addressed lan ports
-"static") MODE=server ;;
+"static") [ -e /proc/sys/net/ipv6 ] && MODE=server || MODE=disabled ;;
 *) MODE=disabled ;;
 esac