aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorRosy Song <rosysong@rosinson.com>2018-09-12 09:21:19 +0800
committerJo-Philipp Wich <jo@mein.io>2018-12-18 11:28:13 +0100
commitd9f845f76132772f010bd7541c1780d18c238ebc (patch)
tree6c45fa66ff6cdd201e789c5eb52bba0f4ee96695 /package/network/services
parent15a023a458a28a23450c44e0bc6c535bfc15e2a1 (diff)
downloadupstream-d9f845f76132772f010bd7541c1780d18c238ebc.tar.gz
upstream-d9f845f76132772f010bd7541c1780d18c238ebc.tar.bz2
upstream-d9f845f76132772f010bd7541c1780d18c238ebc.zip
odhcpd: enable ipv6 server mode only when it is supported
Signed-off-by: Rosy Song <rosysong@rosinson.com> (backported from 918ec4d549cc80b590e50003d0c489c27f864749)
Diffstat (limited to 'package/network/services')
-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