From 787326b43e332b378899205294b1d92ea77a45d4 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 8 Feb 2018 18:21:12 +0100 Subject: [PATCH] odhcp6c: fix appending of emtpy sendopt value (FS#1336) Don't append an empty sendopts value as odhcp6c bails out immediately on an empty -x option triggering an infinite start loop of odhcp6c Signed-off-by: Hans Dedecker --- package/network/ipv6/odhcp6c/Makefile | 2 +- package/network/ipv6/odhcp6c/files/dhcpv6.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index ac793f1ad2de..9989f80f1a64 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcp6c -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index bc7f01d3220a..5c2ee6b988ca 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -77,7 +77,7 @@ proto_dhcpv6_setup() { sendopts_cb() { local val="$1" - append opts "-x$val" + [ -n "$val" ] && append opts "-x$val" } json_for_each_item sendopts_cb sendopts -- 2.30.2