From 175b2623288957dc7087278d1e78a7eedb077f8f Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 1 Mar 2018 18:38:55 +0100 Subject: [PATCH] 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 --- package/network/config/netifd/Makefile | 2 +- package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 6e208ddd9641..8b5d2f8ff3a3 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 afcfba9f49a7..a2b0ccedbf32 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 "$@" -- 2.30.2