[Pkg-samba-maint] r2847 - trunk/samba4/debian

[jelmer at alioth.debian.org]

tags 522646 pending
thanks

Author: jelmer
Date: 2009-06-13 03:55:00 +0000 (Sat, 13 Jun 2009)
New Revision: 2847

Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/samba4.init
Log:
Fix init script to run samba rather than smbd. (Closes: #522646)

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2009-06-13 03:54:50 UTC (rev 2846)
+++ trunk/samba4/debian/changelog	2009-06-13 03:55:00 UTC (rev 2847)
@@ -14,8 +14,9 @@
   * samba4-testsuite now recommends subunit, since it can output subunit
     streams.
   * Document license for Active Directory schemas.
+  * Fix init script to run samba rather than smbd. (Closes: #522646)
 
- -- Jelmer Vernooij <jelmer at debian.org>  Fri, 12 Jun 2009 15:20:19 +0200
+ -- Jelmer Vernooij <jelmer at debian.org>  Sat, 13 Jun 2009 05:52:00 +0200
 
 samba4 (4.0.0~alpha7~20090225-1) experimental; urgency=low
 

Modified: trunk/samba4/debian/samba4.init
===================================================================
--- trunk/samba4/debian/samba4.init	2009-06-13 03:54:50 UTC (rev 2846)
+++ trunk/samba4/debian/samba4.init	2009-06-13 03:55:00 UTC (rev 2847)
@@ -6,29 +6,29 @@
 # Required-Stop:     $network $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: start Samba daemons (smbd)
+# Short-Description: start Samba daemons 
 ### END INIT INFO
 
 #
-# Start/stops the Samba daemon (smbd).
+# Start/stops the Samba daemon (samba).
 # Adapted from the Samba 3 packages.
 #
 
-SMBDPID=/var/run/samba/smbd.pid
+SAMBAPID=/var/run/samba/samba.pid
 
 # clear conflicting settings from the environment
 unset TMPDIR
 
 # See if the daemon and the config file are there
-test -x /usr/sbin/smbd -a -r /etc/samba/smb.conf || exit 0
+test -x /usr/sbin/samba -a -r /etc/samba/smb.conf || exit 0
 
 . /lib/lsb/init-functions
 
 case "$1" in
 	start)
-		log_daemon_msg "Starting Samba 4 daemon" "smbd"
+		log_daemon_msg "Starting Samba 4 daemon" "samba"
 		
-		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd -- -D; then
+		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/samba -- -D; then
 			log_end_msg 1
 			exit 1
 		fi
@@ -36,16 +36,16 @@
 		log_end_msg 0
 		;;
 	stop)
-		log_daemon_msg "Stopping Samba 4 daemon" "smbd"
+		log_daemon_msg "Stopping Samba 4 daemon" "samba"
 
-		start-stop-daemon --stop --quiet --name smbd $SMBDPID
+		start-stop-daemon --stop --quiet --name samba $SAMBAPID
 		# Wait a little and remove stale PID file
 		sleep 1
-		if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null
+		if [ -f $SAMBAPID ] && ! ps h `cat $SAMBAPID` > /dev/null
 		then
-			# Stale PID file (smbd was succesfully stopped),
-			# remove it (should be removed by smbd itself IMHO.)
-			rm -f $SMBDPID
+			# Stale PID file (samba was succesfully stopped),
+			# remove it (should be removed by samba itself IMHO.)
+			rm -f $SAMBAPID
 		fi
 
 		log_end_msg 0