# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1235735271 0
# Node ID 5722056d2bd3b7eb3a9052280f2a1733937ea0cf
# Parent  fa8a5ded702ae3634c67bb5c766c7addbbdcf23b
Samba: improve start script

diff -r fa8a5ded702a -r 5722056d2bd3 samba/stuff/etc/init.d/samba
--- a/samba/stuff/etc/init.d/samba	Thu Feb 26 12:32:55 2009 +0000
+++ b/samba/stuff/etc/init.d/samba	Fri Feb 27 11:47:51 2009 +0000
@@ -18,43 +18,39 @@
 case "$1" in
   start)
     if active_pidfile $SMBPIDFILE smbd ; then
-      echo "$NAME already running."
-      exit 1
+      echo "$NAME: $SMBD already running."
+    else
+      echo -n "Starting $DESC: $SMBD... "
+      $SMBD -D
+      status
     fi
-    echo -n "Starting $DESC: $SMBD... "
-    $SMBD -D
-    status
-    echo -n "Starting $DESC: $NMBD... "
-    $NMBD -D
-    status
+    if active_pidfile $NMBPIDFILE smbd ; then
+      echo "$NAME: $NMBD already running."
+    else
+      echo -n "Starting $DESC: $NMBD... "
+      $NMBD -D
+      status
+    fi
     ;;
   stop)
     if ! active_pidfile $SMBPIDFILE smbd ; then
-      echo "$NAME is not running."
-      exit 1
+      echo "$NAME: $SMBD is not running."
+    else
+      echo -n "Stopping $DESC: $SMBD... "
+      kill `cat $SMBPIDFILE`
+      status
     fi
-    echo -n "Stopping $DESC: $SMBD... "
-    kill `cat $SMBPIDFILE`
-    status
-    echo -n "Stopping $DESC: $NMBD... "
-    kill `cat $NMBPIDFILE`
-    status
+    if ! active_pidfile $NMBPIDFILE smbd ; then
+      echo "$NAME: $NMBD is not running."
+    else
+      echo -n "Stopping $DESC: $NMBD... "
+      kill `cat $NMBPIDFILE`
+      status
+    fi
     ;;
   restart)
-    if ! active_pidfile $SMBPIDFILE smbd ; then
-      echo "$NAME is not running."
-      exit 1
-    fi
-    echo -n "Restarting $DESC: $SMBD... "
-    kill `cat $SMBPIDFILE`
-    sleep 2
-    $SMBD -D
-    status
-    echo -n "Restarting $DESC: $NMBD... "
-    kill `cat $NMBPIDFILE`
-    sleep 2
-    $NMBD -D
-    status
+    $0 stop
+    $0 start
     ;;
   reload)
     if ! active_pidfile $SMBPIDFILE smbd ; then