aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosy Song <rosysong@rosinson.com>2018-09-12 09:21:19 +0800
committerHans Dedecker <dedeckeh@gmail.com>2018-09-12 21:47:33 +0200
commit918ec4d549cc80b590e50003d0c489c27f864749 (patch)
treee8ec9f1ed8f0fb5c0e77f611c1c18ff19d747e14
parent8cac8572897c28e902218b445aa9bed82c40989f (diff)
downloadupstream-918ec4d549cc80b590e50003d0c489c27f864749.tar.gz
upstream-918ec4d549cc80b590e50003d0c489c27f864749.tar.bz2
upstream-918ec4d549cc80b590e50003d0c489c27f864749.zip
odhcpd: enable ipv6 server mode only when it is supported
Signed-off-by: Rosy Song <rosysong@rosinson.com>
-rw-r--r--package/network/services/odhcpd/Makefile2
-rw-r--r--package/network/services/odhcpd/files/odhcpd.defaults2
2 files changed, 2 insertions, 2 deletions
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