From 1953132ceaccbe2020af810ebf2370ccb3cf9f70 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Tue, 5 May 2020 21:07:28 +0300 Subject: sysrepo: update to 1.4.2 Signed-off-by: Lucian Cristian --- net/sysrepo/files/libsysrepo.default | 18 +++++++++--------- net/sysrepo/files/sysrepo.init | 10 +--------- 2 files changed, 10 insertions(+), 18 deletions(-) (limited to 'net/sysrepo/files') diff --git a/net/sysrepo/files/libsysrepo.default b/net/sysrepo/files/libsysrepo.default index 6fd06ef81..415804192 100644 --- a/net/sysrepo/files/libsysrepo.default +++ b/net/sysrepo/files/libsysrepo.default @@ -3,29 +3,29 @@ # Warning, problems can occur if the device restarts in the middle of this uci-default script if [ -x /bin/sysrepoctl ]; then - match=$(sysrepoctl -l | grep "notifications ") + match=$(sysrepoctl -l | grep "ietf-netconf-notifications ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/notifications@2008-07-14.yang -p 666 + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-notifications.yang -p 666 fi - match=$(sysrepoctl -l | grep "nc-notifications ") + match=$(sysrepoctl -l | grep "ietf-netconf-with-default ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/nc-notifications@2008-07-14.yang -p 666 + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-with-defaults.yang -p 666 fi - match=$(sysrepoctl -l | grep "ietf-netconf-acm ") + match=$(sysrepoctl -l | grep "ietf-origin ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-acm@2018-02-14.yang -p 644 + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-origin.yang -p 644 fi - match=$(sysrepoctl -l | grep "ietf-netconf-notifications ") + match=$(sysrepoctl -l | grep "sysrepo ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-notifications@2012-02-06.yang -p 600 + sysrepoctl --install --yang=/etc/sysrepo/yang/sysrepo.yang -p 600 fi match=$(sysrepoctl -l | grep "ietf-netconf ") if [ ! "$match" ]; then - sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf@2011-06-01.yang -p 600 + sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf.yang -p 600 fi sysrepoctl -m ietf-netconf -e writable-running sysrepoctl -m ietf-netconf -e candidate diff --git a/net/sysrepo/files/sysrepo.init b/net/sysrepo/files/sysrepo.init index a2599cbdb..4b832939b 100644 --- a/net/sysrepo/files/sysrepo.init +++ b/net/sysrepo/files/sysrepo.init @@ -4,16 +4,9 @@ START=60 STOP=10 USE_PROCD=1 -PROG_DAEMON=/bin/sysrepod -PROG_PLUGIN=/bin/sysrepo-plugind +PROG_PLUGIN=/usr/bin/sysrepo-plugind start_service() { - procd_open_instance - procd_set_param command ${PROG_DAEMON} - procd_append_param command -d -l 0 - procd_set_param respawn - procd_close_instance - procd_open_instance procd_set_param command ${PROG_PLUGIN} procd_append_param command -d -l 0 @@ -25,6 +18,5 @@ stop_service() { kill -9 `ps | grep netopeer2-server | grep -v grep | awk '{print $1}'` >/dev/null 2>&1 service_stop ${PROG_PLUGIN} - service_stop ${PROG_DAEMON} rm -rf /var/run/sysrepo-subscriptions/* } -- cgit v1.2.3