From d81a2a591052537d6161bf95671ac815cdf52a69 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Wed, 1 Mar 2006 19:19:31 +0000
Subject: Resolve daemon issues (resolves ticket #30)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1784 ce84e21b-d406-0410-9b95-82705330c041
---
 debian/bcfg2-server.init | 16 ++++++----------
 src/sbin/bcfg2-server    |  6 +++++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/bcfg2-server.init b/debian/bcfg2-server.init
index e052a854f..8025b72cc 100644
--- a/debian/bcfg2-server.init
+++ b/debian/bcfg2-server.init
@@ -11,23 +11,19 @@ PIDFILE=/var/tmp/bcfg2-server.pid
 case "$1" in
   start)
     echo -n "Starting bcfg2-server: "
-    if [ -f "/etc/SuSE-release" ] ; then
-        /sbin/start_daemon -p "${PIDFILE}" /usr/sbin/bcfg2-server
-    elif [ -f "/etc/redhat-release" ]; then
-       /usr/sbin/bcfg2-server -D "${PIDFILE}"
+    if [ -f "/etc/debian_version" ] ; then
+	/sbin/start-stop-daemon --pidfile "${PIDFILE}" --make-pidfile -b -S --startas /usr/sbin/bcfg2-server
     else
-       /sbin/start-stop-daemon --pidfile "${PIDFILE}" --make-pidfile -b -S --startas /usr/sbin/bcfg2-server
+	/usr/sbin/bcfg2-server -D "${PIDFILE}"
     fi
     echo "bcfg2-server"
     ;;
   stop)
     echo -n "Stopping bcfg2-server: "
-    if [ -f "/etc/SuSE-release" ] ; then
-        /sbin/killproc -p "${PIDFILE}" /usr/sbin/bcfg2-server
-    elif [ -f "/etc/redhat-release" ]; then
-       kill -INT `cat ${PIDFILE}`
-    else
+    if [ -f "/etc/debian_version" ] ; then
        /sbin/start-stop-daemon -p "${PIDFILE}" -K /usr/sbin/bcfg2-server
+    else
+       kill -INT `cat ${PIDFILE}`
     fi
     echo done
     ;;
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 7d2b55f91..4fc517e76 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -197,7 +197,11 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component):
         return "<ok/>"
 
 if __name__ == '__main__':
-    Bcfg2.Logging.setup_logging('bcfg2-server')
+    if '-D' in sys.argv:
+        Bcfg2.Logging.setup_logging('bcfg2-server', to_console=False)
+    else:
+        Bcfg2.Logging.setup_logging('bcfg2-server')
+        
     options =  {
         'v':'verbose',
         'd':'debug',
-- 
cgit v1.2.3-1-g7c22