summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-11-29 16:58:10 +0100
committerGünther Deschner <gd@samba.org>2011-12-01 12:39:36 +0100
commit01aa0bbadc005d0504435ce0f553ca052670f860 (patch)
treeace3afe58793c743d668fd561514ea435b570e88
parenta20f2cd2128afcd14824f976cc12968e8b4a01aa (diff)
downloadsamba4-01aa0bbadc005d0504435ce0f553ca052670f860.tar.gz
samba4-01aa0bbadc005d0504435ce0f553ca052670f860.tar.xz
samba4-01aa0bbadc005d0504435ce0f553ca052670f860.zip
Remove sysinitV files.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org> Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--nmb.init114
-rw-r--r--samba4.spec14
-rw-r--r--smb.init114
-rw-r--r--winbind.init102
4 files changed, 0 insertions, 344 deletions
diff --git a/nmb.init b/nmb.init
deleted file mode 100644
index 6234ff9..0000000
--- a/nmb.init
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 91 35
-# description: Starts and stops the Samba smbd and nmbd daemons \
-# used to provide SMB network services.
-#
-# pidfile: /var/run/samba/nmbd.pid
-# config: /etc/samba/smb.conf
-
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
- . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
- . /etc/rc.d/init.d/functions
-else
- exit 1
-fi
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ -f /etc/sysconfig/samba ]; then
- . /etc/sysconfig/samba
-fi
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 1
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 6
-
-RETVAL=0
-
-
-start() {
- KIND="NMB"
- echo -n $"Starting $KIND services: "
- daemon nmbd $NMBDOPTIONS
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nmb || \
- RETVAL=1
- return $RETVAL
-}
-
-stop() {
- KIND="NMB"
- echo -n $"Shutting down $KIND services: "
- killproc nmbd
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/nmb
- return $RETVAL
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- echo -n $"Reloading smb.conf file: "
- killproc nmbd -HUP
- RETVAL=$?
- echo
- return $RETVAL
-}
-
-rhstatus() {
- status -l nmb nmbd
- return $?
-}
-
-
-# Allow status as non-root.
-if [ "$1" = status ]; then
- rhstatus
- exit $?
-fi
-
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
-
-
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- restart
- ;;
- reload)
- reload
- ;;
- status)
- rhstatus
- ;;
- condrestart)
- [ -f /var/lock/subsys/nmb ] && restart || :
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
- exit 2
-esac
-
-exit $?
diff --git a/samba4.spec b/samba4.spec
index 287e9b8..2685894 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -23,12 +23,9 @@ Source1: samba.log
Source2: samba.xinetd
Source3: swat.desktop
-Source5: smb.init
Source6: samba.pamd
#Source7: smbprint
-Source8: winbind.init
Source9: smb.conf.default
-Source10: nmb.init
Source11: pam_winbind.conf
#Patch1: waf.diff
@@ -240,12 +237,9 @@ The samba-dc package provides AD Domain Controller functionality
# copy Red Hat specific scripts
mkdir packaging/Fedora
#cp packaging/RHEL/setup/smbusers packaging/Fedora/
-cp %{SOURCE5} packaging/Fedora/
cp %{SOURCE6} packaging/Fedora/
#cp %{SOURCE7} packaging/Fedora/
-cp %{SOURCE8} packaging/Fedora/winbind.init
cp %{SOURCE9} packaging/Fedora/
-cp %{SOURCE10} packaging/Fedora/
cp %{SOURCE11} packaging/Fedora/
#%patch1 -p1 -b .waf
@@ -288,7 +282,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/sbin
mkdir -p $RPM_BUILD_ROOT/usr/{sbin,bin}
-mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{pam.d,logrotate.d,security}
mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
mkdir -p $RPM_BUILD_ROOT/var/lib/samba
@@ -324,11 +317,7 @@ install -m644 packaging/Fedora/smb.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/sa
#install -m755 %samba_source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
#install -m644 packaging/Fedora/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
#install -m755 packaging/Fedora/smbprint $RPM_BUILD_ROOT%{_bindir}
-install -m755 packaging/Fedora/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
-install -m755 packaging/Fedora/nmb.init $RPM_BUILD_ROOT%{_initrddir}/nmb
-install -m755 packaging/Fedora/winbind.init $RPM_BUILD_ROOT%{_initrddir}/winbind
install -m644 packaging/Fedora/pam_winbind.conf $RPM_BUILD_ROOT%{_sysconfdir}/security
-#ln -s ../..%{_initrddir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba
install -m644 packaging/Fedora/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/samba
echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
@@ -441,8 +430,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/samba/vfs
%{_unitdir}/nmb.service
%{_unitdir}/smb.service
-%attr(755,root,root) %{_initrddir}/smb
-%attr(755,root,root) %{_initrddir}/nmb
%config(noreplace) %{_sysconfdir}/logrotate.d/samba
%config(noreplace) %{_sysconfdir}/pam.d/samba
%attr(0700,root,root) %dir /var/log/samba
@@ -474,7 +461,6 @@ rm -rf $RPM_BUILD_ROOT
%ghost %dir /var/run/winbindd
%attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
%config(noreplace) %{_sysconfdir}/security/pam_winbind.conf
-%{_initrddir}/winbind
%{_unitdir}/winbind.service
#%{_mandir}/man1/ntlm_auth.1*
#%{_mandir}/man1/wbinfo.1*
diff --git a/smb.init b/smb.init
deleted file mode 100644
index f9fec26..0000000
--- a/smb.init
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 91 35
-# description: Starts and stops the Samba smbd daemon \
-# used to provide SMB network services.
-#
-# pidfile: /var/run/samba/smbd.pid
-# config: /etc/samba/smb.conf
-
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
- . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
- . /etc/rc.d/init.d/functions
-else
- exit 1
-fi
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ -f /etc/sysconfig/samba ]; then
- . /etc/sysconfig/samba
-fi
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 1
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 6
-
-RETVAL=0
-
-
-start() {
- KIND="SMB"
- echo -n $"Starting $KIND services: "
- daemon smbd $SMBDOPTIONS
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/smb || \
- RETVAL=1
- return $RETVAL
-}
-
-stop() {
- KIND="SMB"
- echo -n $"Shutting down $KIND services: "
- killproc smbd
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/smb
- return $RETVAL
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- echo -n $"Reloading smb.conf file: "
- killproc smbd -HUP
- RETVAL=$?
- echo
- return $RETVAL
-}
-
-rhstatus() {
- status -l smb smbd
- return $?
-}
-
-
-# Allow status as non-root.
-if [ "$1" = status ]; then
- rhstatus
- exit $?
-fi
-
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
-
-
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- restart
- ;;
- reload)
- reload
- ;;
- status)
- rhstatus
- ;;
- condrestart)
- [ -f /var/lock/subsys/smb ] && restart || :
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
- exit 2
-esac
-
-exit $?
diff --git a/winbind.init b/winbind.init
deleted file mode 100644
index 88ce028..0000000
--- a/winbind.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 27 73
-# description: Starts and stops the Samba winbind daemon
-# #
-# pidfile: /var/run/winbindd.pid
-# config: /etc/samba/smb.conf
-
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 1
-
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 6
-
-[ -f /etc/sysconfig/samba ] && . /etc/sysconfig/samba
-
-RETVAL=0
-
-
-start() {
- KIND="Winbind"
- echo -n $"Starting $KIND services: "
- daemon winbindd "$WINBINDOPTIONS"
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbindd || RETVAL=1
- return $RETVAL
-}
-
-stop() {
- echo
- KIND="Winbind"
- echo -n $"Shutting down $KIND services: "
- killproc winbindd
- RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbindd
- echo ""
- return $RETVAL
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- echo -n $"Reloading smb.conf file: "
- killproc winbindd -HUP
- RETVAL=$?
- echo
- return $RETVAL
-}
-
-rhstatus() {
- status winbindd
- return $?
-}
-
-# Allow status as non-root.
-if [ "$1" = status ]; then
- rhstatus
- exit $?
-fi
-
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 4
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- restart
- ;;
- reload)
- reload
- ;;
- status)
- rhstatus
- ;;
- condrestart)
- [ -f /var/lock/subsys/winbindd ] && restart || :
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
- exit 2
-esac
-
-exit $?