webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

samba: Merge winbind initscript into samba initscript.

Browse Source
This commit is contained in:
Michael Tremer
2014-03-23 21:36:53 +01:00
parent 879dafbf17
commit be2817a72a
5 changed files with 10 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/armv5tel/initscripts
View File

@@ -130,7 +130,6 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdradmin #etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/vsftpd #etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog #etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd #etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d #etc/rc.d/rc0.d

1
config/rootfiles/common/i586/initscripts
View File

@@ -133,7 +133,6 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdradmin #etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/vsftpd #etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog #etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd #etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d #etc/rc.d/rc0.d

1
config/rootfiles/packages/samba
View File

@@ -222,7 +222,6 @@ var/lib/samba
var/log/samba var/log/samba
var/nmbd var/nmbd
etc/rc.d/init.d/samba etc/rc.d/init.d/samba
etc/rc.d/init.d/winbind
srv/web/ipfire/cgi-bin/samba.cgi srv/web/ipfire/cgi-bin/samba.cgi
srv/web/ipfire/cgi-bin/sambahlp.cgi srv/web/ipfire/cgi-bin/sambahlp.cgi
var/ipfire/menu.d/EX-samba.menu var/ipfire/menu.d/EX-samba.menu

13
src/initscripts/init.d/samba
View File

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

50
src/initscripts/init.d/winbind
View File

@@ -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