aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-04-13 16:51:58 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-04-15 14:12:09 +0100
commit7ea412ef5a2871bb42136f914206e15b8cae04e1 (patch)
treebfba995321b87723954e337ddc3d69e099b7db0a
parent7cd482662fbd8b187401a18149f038a06af25ece (diff)
downloadupstream-7ea412ef5a2871bb42136f914206e15b8cae04e1.tar.gz
upstream-7ea412ef5a2871bb42136f914206e15b8cae04e1.tar.bz2
upstream-7ea412ef5a2871bb42136f914206e15b8cae04e1.zip
netifd: relax check in dhcp proto handler
Checking whether /sbin/udhcpc is a symbolic link breaks using the DHCP proto handler inside procd-ujail where bind-mounts are used for the resolved link. Check whether /sbin/udhcpc is executable instead to allow using the proto handler for DHCP-provisioned containers. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit c5f113c43f43c20555298c8500bf91bffbe1f58b)
-rwxr-xr-xpackage/network/config/netifd/files/lib/netifd/proto/dhcp.sh2
1 files changed, 1 insertions, 1 deletions
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 3034b2ba68..ea6d872eb4 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-[ -L /sbin/udhcpc ] || exit 0
+[ -x /sbin/udhcpc ] || exit 0
. /lib/functions.sh
. ../netifd-proto.sh