From 7139808c45e989dba537c5002251ada8a201b8b0 Mon Sep 17 00:00:00 2001
From: Mislav Novakovic <mislav.novakovic@sartura.hr>
Date: Tue, 23 May 2017 12:46:36 +0200
Subject: netopeer2: modified uci-default script

Signed-off-by: Mislav Novakovic <mislav.novakovic@sartura.hr>
---
 net/netopeer2/files/netopeer2-keystored.default | 11 +++--
 net/netopeer2/files/netopeer2-server.default    | 57 ++++++++++++++++++-------
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/net/netopeer2/files/netopeer2-keystored.default b/net/netopeer2/files/netopeer2-keystored.default
index bdcd58ab1..9faeedc22 100644
--- a/net/netopeer2/files/netopeer2-keystored.default
+++ b/net/netopeer2/files/netopeer2-keystored.default
@@ -3,9 +3,14 @@
 # Warning, problems can occur if the device restarts in the middle of this uci-default script
 
 if [ -x /bin/sysrepoctl ]; then
-	sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-keystore.yang -o root:root -p 600
-	sysrepocfg -d startup -i /usr/share/netopeer2-keystored/stock_key_config.xml ietf-keystore
-	rm /usr/share/netopeer2-keystored/stock_key_config.xml
+	match=$(sysrepoctl -l | grep "ietf-keystore\ ")
+	if [ ! "$match" ]; then
+		sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-keystore.yang -o root:root -p 600
+		if [ -x /bin/sysrepocfg ]; then
+			sysrepocfg -d startup -i /usr/share/netopeer2-keystored/stock_key_config.xml ietf-keystore
+			rm /usr/share/netopeer2-keystored/stock_key_config.xml
+		fi
+	fi
 fi
 
 exit 0
diff --git a/net/netopeer2/files/netopeer2-server.default b/net/netopeer2/files/netopeer2-server.default
index 41df88d14..ec6bae052 100644
--- a/net/netopeer2/files/netopeer2-server.default
+++ b/net/netopeer2/files/netopeer2-server.default
@@ -3,22 +3,47 @@
 # Warning, problems can occur if the device restarts in the middle of this uci-default script
 
 if [ -x /bin/sysrepoctl ]; then
-	sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-ssh-server.yang -p 600
-	sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-tls-server.yang -p 600
-	sysrepoctl --install --yang=/etc/sysrepo/yang/iana-crypt-hash.yang -p 600
-	sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-x509-cert-to-name.yang -p 600
-	sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-server.yang -o root:root -p 600
-	sysrepoctl -m ietf-netconf-server -e listen
-	sysrepoctl -m ietf-netconf-server -e ssh-listen
-	sysrepoctl -m ietf-netconf-server -e tls-listen
-	sysrepoctl -m ietf-netconf-server -e call-home
-	sysrepoctl -m ietf-netconf-server -e ssh-call-home
-	sysrepoctl -m ietf-netconf-server -e tls-call-home
-	sysrepocfg -d startup -i /usr/share/netopeer2-server/stock_config.xml ietf-netconf-server
-	rm /usr/share/netopeer2-server/stock_config.xml
-	sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-system.yang -o root:root -p 600
-	sysrepoctl -m ietf-system -e authentication
-	sysrepoctl -m ietf-system -e local-users
+	match=$(sysrepoctl -l | grep "ietf-ssh-server\ ")
+	if [ ! "$match" ]; then
+		sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-ssh-server.yang -p 600
+	fi
+
+	match=$(sysrepoctl -l | grep "ietf-tls-server\ ")
+	if [ ! "$match" ]; then
+		sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-tls-server.yang -p 600
+	fi
+
+	match=$(sysrepoctl -l | grep "iana-crypt-hash\ ")
+	if [ ! "$match" ]; then
+		sysrepoctl --install --yang=/etc/sysrepo/yang/iana-crypt-hash.yang -p 600
+	fi
+
+	match=$(sysrepoctl -l | grep "ietf-x509-cert-to-name\ ")
+	if [ ! "$match" ]; then
+		sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-x509-cert-to-name.yang -p 600
+	fi
+
+	match=$(sysrepoctl -l | grep "ietf-netconf-server\ ")
+	if [ ! "$match" ]; then
+		sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-netconf-server.yang -o root:root -p 600
+		sysrepoctl -m ietf-netconf-server -e listen
+		sysrepoctl -m ietf-netconf-server -e ssh-listen
+		sysrepoctl -m ietf-netconf-server -e tls-listen
+		sysrepoctl -m ietf-netconf-server -e call-home
+		sysrepoctl -m ietf-netconf-server -e ssh-call-home
+		sysrepoctl -m ietf-netconf-server -e tls-call-home
+		if [ -x /bin/sysrepocfg ]; then
+			sysrepocfg -d startup -i /usr/share/netopeer2-server/stock_config.xml ietf-netconf-server
+			rm /usr/share/netopeer2-server/stock_config.xml
+		fi
+	fi
+
+	match=$(sysrepoctl -l | grep "ietf-system\ ")
+	if [ ! "$match" ]; then
+		sysrepoctl --install --yang=/etc/sysrepo/yang/ietf-system.yang -o root:root -p 600
+		sysrepoctl -m ietf-system -e authentication
+		sysrepoctl -m ietf-system -e local-users
+	fi
 fi
 
 exit 0
-- 
cgit v1.2.3