From 0aa8371086e577aa6610b4a9e7fd38bbad580a77 Mon Sep 17 00:00:00 2001
From: Mislav Novakovic <mislav.novakovic@sartura.hr>
Date: Wed, 24 May 2017 17:08:19 +0200
Subject: sysrepo: merge sysrepod and sysrepo-plugind

Signed-off-by: Mislav Novakovic <mislav.novakovic@sartura.hr>
---
 net/sysrepo/files/sysrepo-plugind.init | 19 -------------------
 net/sysrepo/files/sysrepo.init         | 34 ++++++++++++++++++++++++++++++++++
 net/sysrepo/files/sysrepod.init        | 19 -------------------
 3 files changed, 34 insertions(+), 38 deletions(-)
 delete mode 100644 net/sysrepo/files/sysrepo-plugind.init
 create mode 100644 net/sysrepo/files/sysrepo.init
 delete mode 100644 net/sysrepo/files/sysrepod.init

(limited to 'net/sysrepo/files')

diff --git a/net/sysrepo/files/sysrepo-plugind.init b/net/sysrepo/files/sysrepo-plugind.init
deleted file mode 100644
index d394256ae..000000000
--- a/net/sysrepo/files/sysrepo-plugind.init
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/bin/sysrepo-plugind
-
-start_service() {
-    procd_open_instance
-    procd_set_param command $PROG
-    procd_set_param respawn
-    procd_close_instance
-}
-
-stop_service()
-{
-    service_stop ${PROG}
-}
diff --git a/net/sysrepo/files/sysrepo.init b/net/sysrepo/files/sysrepo.init
new file mode 100644
index 000000000..9c9262c37
--- /dev/null
+++ b/net/sysrepo/files/sysrepo.init
@@ -0,0 +1,34 @@
+#!/bin/sh /etc/rc.common
+
+START=70
+STOP=10
+
+USE_PROCD=1
+PROG_DEAMON=/bin/sysrepod
+PROG_PLUGIN=/bin/sysrepo-plugind
+
+start_service() {
+    procd_open_instance
+    procd_set_param command ${PROG_DEAMON}
+    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
+    procd_set_param respawn
+    procd_close_instance
+}
+
+stop_service()
+{
+    if [ -f /etc/init.d/netopeer2-server ]; then
+        # netopeer2-server will automatically start sysrepod,
+        # so we need to stop it
+        /etc/init.d/netopeer2-server stop
+        sleep 1
+    fi
+    service_stop ${PROG_PLUGIN}
+    service_stop ${PROG_DEAMON}
+}
diff --git a/net/sysrepo/files/sysrepod.init b/net/sysrepo/files/sysrepod.init
deleted file mode 100644
index 843e3b56c..000000000
--- a/net/sysrepo/files/sysrepod.init
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=70
-STOP=10
-
-USE_PROCD=1
-PROG=/bin/sysrepod
-
-start_service() {
-    procd_open_instance
-    procd_set_param command $PROG
-    procd_set_param respawn
-    procd_close_instance
-}
-
-stop_service()
-{
-    service_stop ${PROG}
-}
-- 
cgit v1.2.3