diff options
Diffstat (limited to 'packaging/Debian/debian/samba.init')
| -rw-r--r-- | packaging/Debian/debian/samba.init | 90 |
1 files changed, 40 insertions, 50 deletions
diff --git a/packaging/Debian/debian/samba.init b/packaging/Debian/debian/samba.init index 8ac2e97148..3894fe1e64 100644 --- a/packaging/Debian/debian/samba.init +++ b/packaging/Debian/debian/samba.init @@ -2,42 +2,21 @@ # # Start/stops the Samba daemons (nmbd and smbd). # +# $Id: samba.init,v 1.3 2003/06/01 07:12:51 peloy Exp $ +# + +# Defaults +RUN_MODE="daemons" -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DEBIAN_CONFIG=/etc/samba/debian_config +# Reads config file (will override defaults above) +[ -r /etc/default/samba ] && . /etc/default/samba -NMBDPID=/var/state/samba/nmbd.pid -SMBDPID=/var/state/samba/smbd.pid +NMBDPID=/var/run/samba/nmbd.pid +SMBDPID=/var/run/samba/smbd.pid # clear conflicting settings from the environment unset TMPDIR -# Sanity check: see if Samba has been configured on this system. -if [ ! -f $DEBIAN_CONFIG ]; then - echo "The file $DEBIAN_CONFIG does not exist! There is something wrong" - echo "with the installation of Samba on this system. Please re-install" - echo "Samba. I can't continue!!!" - exit 1 -fi - -# Read current Samba configuration -. $DEBIAN_CONFIG - -# the Samba daemons. - -# If Samba is running from inetd then there is nothing to do -if [ "$run_mode" = "from_inetd" ]; then - # Commented out to close bug #26884 (startup message is rather long). I - # have yet to think how to let the user know that if he/she is running - # Samba from inetd, he can't just "/etc/init.d/samba stop" to stop - # the Samba daemons. -# echo "Warning: Samba is not running as daemons. Daemons not restarted/stopped." -# echo "Daemons will start automatically by inetd (if you wanted to start Samba)." -# echo "If you want to stop Samba, get the PID's of all nmbd and smbd processes" -# echo "and send them a SIGTERM signal but keep in mind that inetd could restart them." - exit 0 -fi - # See if the daemons are there test -x /usr/sbin/nmbd -a -x /usr/sbin/smbd || exit 0 @@ -48,21 +27,42 @@ case "$1" in echo -n " nmbd" start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- -D - echo -n " smbd" - start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D + if [ "$RUN_MODE" != "inetd" ]; then + echo -n " smbd" + start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D + fi echo "." ;; stop) - echo -n "Stopping Samba daemons:" + echo -n "Stopping Samba daemons: " - echo -n " nmbd" start-stop-daemon --stop --quiet --pidfile $NMBDPID - - echo -n " smbd" - start-stop-daemon --stop --quiet --pidfile $SMBDPID + # Wait a little and remove stale PID file + sleep 1 + if [ -f $NMBDPID ] && ! ps h `cat $NMBDPID` > /dev/null + then + # Stale PID file (nmbd was succesfully stopped), + # remove it (should be removed by nmbd itself IMHO.) + rm -f $NMBDPID + fi + echo -n "nmbd" + + if [ "$RUN_MODE" != "inetd" ]; then + start-stop-daemon --stop --quiet --pidfile $SMBDPID + # Wait a little and remove stale PID file + sleep 1 + if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null + then + # Stale PID file (nmbd was succesfully stopped), + # remove it (should be removed by smbd itself IMHO.) + rm -f $SMBDPID + fi + echo -n " smbd" + fi echo "." + ;; reload) echo -n "Reloading /etc/samba/smb.conf (smbd only)" @@ -71,19 +71,9 @@ case "$1" in echo "." ;; restart|force-reload) - echo -n "Restarting Samba daemons:" - - echo -n " nmbd" - start-stop-daemon --stop --quiet --pidfile $NMBDPID - sleep 2 - start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- -D - - echo -n " smbd" - start-stop-daemon --stop --quiet --pidfile $SMBDPID - sleep 2 - start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D - - echo "." + $0 stop + sleep 1 + $0 start ;; *) echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}" |