netopeer2: modified uci-default script

Signed-off-by: Mislav Novakovic <mislav.novakovic@sartura.hr>

diff --git a/net/netopeer2/files/netopeer2-keystored.default b/net/netopeer2/files/netopeer2-keystored.default
index bdcd58ab19b68fbf32ba04a31b74af6af42b2ba4..9faeedc2215aea400ec0a2a757cb9369bca7261c 100644 (file)
--- 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 41df88d145f71bb4826b43603c65ab72e5bee2a2..ec6bae0524b73ca6d2e4f774adb8a073afb31988 100644 (file)
--- 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