samba: Merge winbind initscript into samba initscript.

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 5d5c6920490f847f710759131c7dc78d5a91b445..3fdf858d326d76f4a511bd623f81c18a03fe5efa 100644 (file)
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -130,7 +130,6 @@ etc/rc.d/init.d/upnpd
 #etc/rc.d/init.d/vdradmin
 #etc/rc.d/init.d/vsftpd
 #etc/rc.d/init.d/watchdog
-#etc/rc.d/init.d/winbind
 etc/rc.d/init.d/wlanclient
 #etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index fa3dbcdb8c279fde9251a03f510b031f61a49a7d..162d9380f9fc18fdac259eff6e7d579a41e4c6eb 100644 (file)
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -133,7 +133,6 @@ etc/rc.d/init.d/upnpd
 #etc/rc.d/init.d/vdradmin
 #etc/rc.d/init.d/vsftpd
 #etc/rc.d/init.d/watchdog
-#etc/rc.d/init.d/winbind
 etc/rc.d/init.d/wlanclient
 #etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d

diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba
index 9882067685a73ca56a5f97e291aab755aa7965ef..807dd9f2174723e96133b4325cbc566a53e14040 100644 (file)
--- a/config/rootfiles/packages/samba
+++ b/config/rootfiles/packages/samba
@@ -222,7 +222,6 @@ var/lib/samba
 var/log/samba
 var/nmbd
 etc/rc.d/init.d/samba
-etc/rc.d/init.d/winbind
 srv/web/ipfire/cgi-bin/samba.cgi
 srv/web/ipfire/cgi-bin/sambahlp.cgi
 var/ipfire/menu.d/EX-samba.menu

diff --git a/src/initscripts/init.d/samba b/src/initscripts/init.d/samba
index d6bdb262af92e7bab7e42cd7a9108635d0a2e81c..1c062bf7ebc1a50a972c0b647a2fa59b8e8c0694 100644 (file)
--- a/src/initscripts/init.d/samba
+++ b/src/initscripts/init.d/samba
@@ -4,9 +4,6 @@
 # Based on sysklogd script from LFS-3.1 and earlier.
 # Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
 
-#$LastChangedBy: bdubbs $
-#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
 . /etc/sysconfig/rc
 . $rc_functions
 
@@ -17,6 +14,9 @@ case "$1" in
 
                boot_mesg "Starting smbd..."
                loadproc /usr/sbin/smbd -D
+
+               boot_mesg "Starting winbind..."
+               loadproc /usr/sbin/winbindd
                ;;
 
        stop)
@@ -25,6 +25,9 @@ case "$1" in
 
                boot_mesg "Stopping nmbd..."
                killproc -p /var/run/nmbd.pid /usr/sbin/nmbd
+
+               boot_mesg "Stopping winbind..."
+               killproc -p /var/run/winbindd.pid /usr/sbin/winbindd
                 ;;
 
        reload)
@@ -33,6 +36,9 @@ case "$1" in
 
                boot_mesg "Reloading nmbd..."
                reloadproc /usr/sbin/nmbd
+
+               boot_mesg "Reloading winbind..."
+               reloadproc /usr/sbin/winbindd
                ;;
 
        restart)
@@ -44,6 +50,7 @@ case "$1" in
        status)
                statusproc /usr/sbin/nmbd
                statusproc /usr/sbin/smbd
+               statusproc /usr/sbin/winbindd
                ;;
 
        *)

diff --git a/src/initscripts/init.d/winbind b/src/initscripts/init.d/winbind
deleted file mode 100644 (file)
index 590fddf..0000000
--- a/src/initscripts/init.d/winbind
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# Begin $rc_base/init.d/winbind
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-PIDFILE="/var/run/winbindd.pid"
-KILLDELAY="10"
-
-case "$1" in
-
-        start)
-                boot_mesg "Starting winbind..."
-                loadproc /usr/sbin/winbindd
-                ;;
-
-        stop)
-                boot_mesg "Stopping winbind..."
-               killproc -p ${PIDFILE} /usr/sbin/winbind
-               ;;
-
-       reload)
-               boot_mesg "Reloading winbind..."
-               reloadproc /usr/sbin/winbindd
-               ;;
-
-        restart)
-                $0 stop
-                sleep 1
-                $0 start
-                ;;
-
-        status)
-                statusproc /usr/sbin/winbindd
-                ;;
-
-        *)
-                echo "Usage: $0 {start|stop|reload|restart|status}"
-                exit 1
-                ;;
-
-esac
-
-# End $rc_base/init.d/winbind