From: Felix Fietkau Date: Fri, 21 Mar 2025 10:58:04 +0000 (+0100) Subject: scripts: fix dummy mode on systems where libubox is in /usr/local X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=c3a0255e21501566590f32356c0e505ed795e35e;p=project%2Fnetifd.git scripts: fix dummy mode on systems where libubox is in /usr/local Signed-off-by: Felix Fietkau --- diff --git a/scripts/netifd-proto.sh b/scripts/netifd-proto.sh index c25aa9f..0093c6a 100644 --- a/scripts/netifd-proto.sh +++ b/scripts/netifd-proto.sh @@ -1,7 +1,10 @@ NETIFD_MAIN_DIR="${NETIFD_MAIN_DIR:-/lib/netifd}" PROTO_DEFAULT_OPTIONS="defaultroute peerdns metric" - -. /usr/share/libubox/jshn.sh +if [ -f /usr/share/libubox/jshn.sh ]; then + . /usr/share/libubox/jshn.sh +else + . /usr/local/share/libubox/jshn.sh +fi . $NETIFD_MAIN_DIR/utils.sh proto_config_add_int() { diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh index 5b852e0..bb3e5c7 100644 --- a/scripts/netifd-wireless.sh +++ b/scripts/netifd-wireless.sh @@ -1,6 +1,10 @@ NETIFD_MAIN_DIR="${NETIFD_MAIN_DIR:-/lib/netifd}" -. /usr/share/libubox/jshn.sh +if [ -f /usr/share/libubox/jshn.sh ]; then + . /usr/share/libubox/jshn.sh +else + . /usr/local/share/libubox/jshn.sh +fi . $NETIFD_MAIN_DIR/utils.sh CMD_UP=0