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

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-03 21:47:09 +0000 (Tue, 03 Jan 2006)
New Revision: 855

Added:
   branches/samba4/samba.init
Removed:
   branches/samba4/samba.samba.init
Modified:
   branches/samba4/changelog
   branches/samba4/rules
Log:
Rename samba.samba.init to samba.init, now that the init script and the
server package are called the same.



Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-03 21:45:32 UTC (rev 854)
+++ branches/samba4/changelog	2006-01-03 21:47:09 UTC (rev 855)
@@ -4,6 +4,8 @@
   * Remove a few unused files in the packaging.
   * Rename samba-server package to just samba, for consistency with the
     Samba 3 packaging.
+    * Rename samba.samba.init to samba.init, now that the init script and the
+      server package are called the same.
   * Be more explicit about what happens to the administrator password the
     user enters.
   * Change SOURCEPATH in debian/rules to reflect that we now have the
@@ -22,9 +24,9 @@
   * 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.
-  * Removed debmake comment from debian/rules, it's hardly relevant any more. 
+  * Removed debmake comment from debian/rules, it's hardly relevant any more.
 
- -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 22:45:16 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 22:46:06 +0100
 
 samba (3.9.0+SVN12395-1) unstable; urgency=low
 

Modified: branches/samba4/rules
===================================================================
--- branches/samba4/rules	2006-01-03 21:45:32 UTC (rev 854)
+++ branches/samba4/rules	2006-01-03 21:47:09 UTC (rev 855)
@@ -81,7 +81,7 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a
-	dh_installinit -a --name=samba
+	dh_installinit -a 
 	dh_installdebconf -a
 	dh_installdeb -a
 	dh_shlibdeps -a

Copied: branches/samba4/samba.init (from rev 853, branches/samba4/samba.samba.init)

Deleted: branches/samba4/samba.samba.init
===================================================================
--- branches/samba4/samba.samba.init	2006-01-03 21:45:32 UTC (rev 854)
+++ branches/samba4/samba.samba.init	2006-01-03 21:47:09 UTC (rev 855)
@@ -1,63 +0,0 @@
-#! /bin/sh
-
-#
-# Start/stops the Samba daemon (smbd).
-# Adapted from the Samba 3 packages.
-#
-
-SMBDPID=/var/run/samba/smbd.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
-
-. /lib/lsb/init-functions
-
-case "$1" in
-	start)
-		log_daemon_msg "Starting Samba 4 daemon" "smbd"
-		
-		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd -- -D; then
-			log_end_msg 1
-			exit 1
-		fi
-
-		log_end_msg 0
-		;;
-	stop)
-		log_daemon_msg "Stopping Samba 4 daemon" "smbd"
-
-		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
-		then
-			# Stale PID file (smbd was succesfully stopped),
-			# remove it (should be removed by smbd itself IMHO.)
-			rm -f $SMBDPID
-		fi
-
-		log_end_msg 0
-
-		;;
-	reload)
-		log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only"
-
-		start-stop-daemon --stop --signal HUP --pidfile $SMBDPID
-
-		log_end_msg 0
-		;;
-	restart|force-reload)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
-		exit 1
-		;;
-esac
-
-exit 0