From: Hans Dedecker <dedeckeh@gmail.com>
Date: Thu, 1 Mar 2018 17:38:55 +0000 (+0100)
Subject: netifd: add udhcpc link check to dhcp shell handler script
X-Git-Tag: v18.06.0-rc1~741
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=175b2623288957dc7087278d1e78a7eedb077f8f;p=oweals%2Fopenwrt.git

netifd: add udhcpc link check to dhcp shell handler script

Fixes the assumption the busybox udhcpc applet is always enabled; in case
the symbolic link check fails the DHCP shell handler script will exit and
as result the DHCP protocol handler will not be registered in netifd.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 6e208ddd96..8b5d2f8ff3 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index afcfba9f49..a2b0ccedbf 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+[ -L /sbin/udhcpc ] || exit 0
+
 . /lib/functions.sh
 . ../netifd-proto.sh
 init_proto "$@"