ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-03-12 07:24:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

odhcp6c: read user scripts from directory

Browse Source 
Placeholder DHCP user scripts were added recently.

These files make package-based installations of such scripts more difficult.
Pull user callbacks from directories instead to allow packages and users to
install co-existing scripts more easily.

References:
b4f3d93b5 odhcp6c: add a odhcp6c.user placeholder script

Signed-off-by: Leon M. George <leon@georgemail.eu>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase]
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
Leon M. George 2021-03-23 11:02:36 +01:00 committed by maurerr
parent 643dffc059
commit 19b8104a3b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/network/ipv6/odhcp6c/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
PKG_RELEASE:=17 PKG_RELEASE:=18
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git
@ -44,6 +44,7 @@ endef
define Package/odhcp6c/conffiles define Package/odhcp6c/conffiles
/etc/odhcp6c.user /etc/odhcp6c.user
/etc/odhcp6c.user.d/
endef endef
define Package/odhcp6c/install define Package/odhcp6c/install
@ -52,7 +53,7 @@ define Package/odhcp6c/install
$(INSTALL_DIR) $(1)/lib/netifd/proto $(INSTALL_DIR) $(1)/lib/netifd/proto
$(INSTALL_BIN) ./files/dhcpv6.sh $(1)/lib/netifd/proto/dhcpv6.sh $(INSTALL_BIN) ./files/dhcpv6.sh $(1)/lib/netifd/proto/dhcpv6.sh
$(INSTALL_BIN) ./files/dhcpv6.script $(1)/lib/netifd/ $(INSTALL_BIN) ./files/dhcpv6.script $(1)/lib/netifd/
$(INSTALL_DIR) $(1)/etc/ $(INSTALL_DIR) $(1)/etc/odhcp6c.user.d/
$(INSTALL_CONF) ./files/odhcp6c.user $(1)/etc/ $(INSTALL_CONF) ./files/odhcp6c.user $(1)/etc/
endef endef

3
package/network/ipv6/odhcp6c/files/dhcpv6.script
View File

@ -237,5 +237,8 @@ esac
# user rules # user rules
[ -f /etc/odhcp6c.user ] && . /etc/odhcp6c.user "$@" [ -f /etc/odhcp6c.user ] && . /etc/odhcp6c.user "$@"
for f in /etc/odhcp6c.user.d/*; do
[ -f "$f" ] && (. "$f" "$@")
done
exit 0 exit 0