From: Rosy Song <rosysong@rosinson.com>
Date: Wed, 12 Sep 2018 01:21:19 +0000 (+0800)
Subject: odhcpd: enable ipv6 server mode only when it is supported
X-Git-Tag: v19.07.0-rc1~2590
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=918ec4d549cc80b590e50003d0c489c27f864749;p=oweals%2Fopenwrt.git

odhcpd: enable ipv6 server mode only when it is supported

Signed-off-by: Rosy Song <rosysong@rosinson.com>
---

diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile
index 25a3cf5649..03adf00455 100644
--- 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 cecbdd4a8d..2d8a6f0b1a 100644
--- 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