From be2817a72ad06fb47ca81da0c27dfd9be433b010 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 23 Mar 2014 21:36:53 +0100 Subject: [PATCH] samba: Merge winbind initscript into samba initscript. --- config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/packages/samba | 1 - src/initscripts/init.d/samba | 13 +++-- src/initscripts/init.d/winbind | 50 -------------------- 5 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 src/initscripts/init.d/winbind diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 5d5c692049..3fdf858d32 100644 --- 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 fa3dbcdb8c..162d9380f9 100644 --- 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 9882067685..807dd9f217 100644 --- 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 d6bdb262af..1c062bf7eb 100644 --- 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 index 590fddf408..0000000000 --- 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 -- 2.39.5