From: Felix Fietkau <nbd@nbd.name>
Date: Wed, 26 Feb 2025 09:35:02 +0000 (+0100)
Subject: cli: use model scope for hook calls
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=795337640073d0f15f6f60a91048c8b2295b9994;p=openwrt%2Fopenwrt.git

cli: use model scope for hook calls

Make the scope consistent with other callbacks

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/services/unetd/files/unet.uc b/package/network/services/unetd/files/unet.uc
index b884e23f60..023ea3e6b8 100644
--- a/package/network/services/unetd/files/unet.uc
+++ b/package/network/services/unetd/files/unet.uc
@@ -151,7 +151,7 @@ function network_sign_data(ctx, name, network, pw_file, upload)
 	return true;
 }
 
-function network_create_uci(name, iface)
+function network_create_uci(model, name, iface)
 {
 	let cur = uci.cursor();
 	cur.set("network", name, "interface");
@@ -344,7 +344,7 @@ function network_create(ctx, argv, named) {
 	if (!network_sign_data(ctx, named.network, network, pw_file))
 		return;
 
-	network_create_uci(named.network, {
+	network_create_uci(ctx.model, named.network, {
 		proto: "unet",
 		metric: named.metric,
 		zone: named.zone,
@@ -580,7 +580,7 @@ function network_join_peer_update(model, ctx, msg)
 	if (joinreq.connect)
 		iface.connect = joinreq.connect;
 
-	network_create_uci(name, iface);
+	network_create_uci(model, name, iface);
 
 	model.status_msg("Configuration added for interface " + name);
 
diff --git a/package/utils/cli/files/usr/share/ucode/cli/datamodel.uc b/package/utils/cli/files/usr/share/ucode/cli/datamodel.uc
index bc78a7b12b..f6d9454dd7 100644
--- a/package/utils/cli/files/usr/share/ucode/cli/datamodel.uc
+++ b/package/utils/cli/files/usr/share/ucode/cli/datamodel.uc
@@ -122,7 +122,7 @@ function run_hook(name, ...args)
 		return;
 
 	for (let hook in hooks)
-		call(hook, this, {}, ...args);
+		call(hook, this, this.scope, ...args);
 }
 
 function init()