[Pkg-samba-maint] r853 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-03 21:44:56 +0000 (Tue, 03 Jan 2006)
New Revision: 853

Modified:
   branches/samba4/changelog
   branches/samba4/samba.samba.init
Log:
Don't give --pidfile to start-stop-daemon when stopping -- current versions of
Samba 4 won't die when the parent is killed. 

(This should be reverted when upstream fixes it, of course -- it's on the TODO
for the tech preview.)



Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-03 21:43:24 UTC (rev 852)
+++ branches/samba4/changelog	2006-01-03 21:44:56 UTC (rev 853)
@@ -19,9 +19,11 @@
   * Make samba-client Replaces/Conflicts smbclient.
   * Rename samba-swat to swat, and add a dependency from swat to samba.
   * Change debhelper compatibility level to 5.
-  * Remove leftover, unused init.d script from debmake. 
+  * Remove leftover, unused init.d script from debmake.
+  * Don't give --pidfile to start-stop-daemon when stopping -- current
+    versions of Samba 4 won't die when the parent is killed. 
 
- -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 22:43:04 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 22:44:04 +0100
 
 samba (3.9.0+SVN12395-1) unstable; urgency=low
 

Modified: branches/samba4/samba.samba.init
===================================================================
--- branches/samba4/samba.samba.init	2006-01-03 21:43:24 UTC (rev 852)
+++ branches/samba4/samba.samba.init	2006-01-03 21:44:56 UTC (rev 853)
@@ -29,7 +29,7 @@
 	stop)
 		log_daemon_msg "Stopping Samba 4 daemon" "smbd"
 
-		start-stop-daemon --stop --quiet --pidfile $SMBDPID
+		start-stop-daemon --stop --quiet $SMBDPID
 		# Wait a little and remove stale PID file
 		sleep 1
 		if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null