Skip to content

Commit a5bc493

Browse files
authored
Merge pull request #1335 from kernelkit/fix-candidate-ds
This reverts a commit introduced in sysrepo v4.2.10
2 parents 120a55f + 634e02c commit a5bc493

File tree

1 file changed

+37
-0
lines changed

1 file changed

+37
-0
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From 8b2f7f3b952b768a44d491258aba9f343686d546 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <[email protected]>
3+
Date: Sun, 21 Dec 2025 10:44:28 +0100
4+
Subject: [PATCH 9/9] Problem runnning from candidate datastore and init nacm
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
Organization: Wires
9+
10+
In this case the datastore will be switched and the caller
11+
will operate on runnning datastore.
12+
13+
Revert "nacm BUGFIX always use the correct DS"
14+
15+
This reverts commit 90ce1f7fbc444309f41a19e4c9fafe8a771c8a66.
16+
17+
Signed-off-by: Mattias Walström <[email protected]>
18+
---
19+
src/utils/nacm.c | 2 --
20+
1 file changed, 2 deletions(-)
21+
22+
diff --git a/src/utils/nacm.c b/src/utils/nacm.c
23+
index 3183cec1..138405e5 100644
24+
--- a/src/utils/nacm.c
25+
+++ b/src/utils/nacm.c
26+
@@ -1021,8 +1021,6 @@ sr_nacm_init(sr_session_ctx_t *session, uint32_t opts, sr_subscription_ctx_t **s
27+
pthread_mutex_init(&nacm.lock, NULL);
28+
29+
/* subscribe to all the relevant config data */
30+
- sr_session_switch_ds(session, SR_DS_RUNNING);
31+
-
32+
mod_name = "ietf-netconf-acm";
33+
xpath = "/ietf-netconf-acm:nacm";
34+
SR_CONFIG_SUBSCR(session, sub, mod_name, xpath, opts, sr_nacm_nacm_params_cb);
35+
--
36+
2.43.0
37+

0 commit comments

Comments
 (0)