From e64207e8e10d710e67234585c25f0718ecb599dd Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Tue, 26 Jul 2011 09:34:12 +0000
Subject: Versión 1.0.2: corregir arranque de servicios en Ubuntu (modifica
 #414)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://opengnsys.es/svn/branches/version1.0@2211 a21b9725-9963-47de-94b9-378ad31fedc9
---
 admin/Sources/Services/opengnsys.init | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'admin/Sources/Services/opengnsys.init')

diff --git a/admin/Sources/Services/opengnsys.init b/admin/Sources/Services/opengnsys.init
index 838b1db2..34fdc30b 100755
--- a/admin/Sources/Services/opengnsys.init
+++ b/admin/Sources/Services/opengnsys.init
@@ -79,8 +79,9 @@ config() {
     case "$OSDISTRIB" in
         Ubuntu)
             INITFUNCTIONS=/lib/lsb/init-functions
-            DAEMONSTART="start_daemon"
-            DAEMONSTOP="killproc"
+            DAEMONSTART="start-stop-daemon --start --quiet --background --exec"
+            EXTRAOPTS="--"
+            DAEMONSTOP="start-stop-daemon --stop --quiet --oknodo --name"
             ACTIONMSG="log_daemon_msg"
             SUCCESSMSG="log_end_msg 0"
             FAILMSG="log_end_msg 1"
@@ -88,6 +89,7 @@ config() {
         Fedora)
             INITFUNCTIONS=/etc/init.d/functions
             DAEMONSTART="daemon"
+            EXTRAOPTS=""
             DAEMONSTOP="killproc"
             ACTIONMSG="echo -n"
             SUCCESSMSG="success; echo"
@@ -105,7 +107,7 @@ arranca_demonios() {
   if [ $RUN_OGADMSERVER = "yes" ]
   then
      $ACTIONMSG "Iniciando demonio: $SERVERNAME"
-     $DAEMONSTART $SERVERDAEMON $SERVERDAEMON_OPTIONS
+     $DAEMONSTART $SERVERDAEMON $EXTRAOPTS $SERVERDAEMON_OPTIONS
      [ $? = 0 ] && $SUCCESSMSG || $FAILMSG
   fi
   if [ $RUN_OGADMSERVER = "yes" ] && [ $RUN_OGADMREPO = "yes" ]
@@ -115,7 +117,7 @@ arranca_demonios() {
   if [ $RUN_OGADMREPO = "yes" ]
   then
      $ACTIONMSG "Iniciando demonio: $REPONAME"
-     $DAEMONSTART $REPODAEMON $REPODAEMON_OPTIONS
+     $DAEMONSTART $REPODAEMON $EXTRAOPTS $REPODAEMON_OPTIONS
      [ $? = 0 ] && $SUCCESSMSG || $FAILMSG
      ############ ADV  	 
      $ACTIONMSG "Iniciando demonio: $REPOAUXNAME"
@@ -126,7 +128,7 @@ arranca_demonios() {
   if [ $RUN_OGADMAGENT = "yes" ]
   then
      $ACTIONMSG "Iniciando demonio: $AGENTNAME"
-     $DAEMONSTART $AGENTDAEMON $AGENTDAEMON_OPTIONS
+     $DAEMONSTART $AGENTDAEMON $EXTRAOPTS $AGENTDAEMON_OPTIONS
      [ $? = 0 ] && $SUCCESSMSG || $FAILMSG
   fi    
   if [ $RUN_BTTRACKER = "yes" ]
-- 
cgit v1.2.3-18-g5258