diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-23 14:39:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:18:57 -0500 |
| commit | 505f6b42c9df01bdee836cf71da5dec90ba13138 (patch) | |
| tree | ff35f9b6d91af1de9c8d13a94820a753e89622cc /packaging | |
| parent | 00a0b0cbf358d5c53f64b239df381c73f277a65b (diff) | |
| download | samba-505f6b42c9df01bdee836cf71da5dec90ba13138.tar.gz | |
r16486: fix RedHat init scripts to rely on OS provided killproc() function
(This used to be commit 164cdf69f395236ffef9ecc202543d53b5eda2da)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RHEL/setup/smb.init | 4 | ||||
| -rw-r--r-- | packaging/RHEL/setup/winbind.init | 2 | ||||
| -rwxr-xr-x | packaging/RedHat-9/smb.init | 11 |
3 files changed, 5 insertions, 12 deletions
diff --git a/packaging/RHEL/setup/smb.init b/packaging/RHEL/setup/smb.init index 30d7d403dd..af85b2c079 100644 --- a/packaging/RHEL/setup/smb.init +++ b/packaging/RHEL/setup/smb.init @@ -71,14 +71,14 @@ start() { stop() { KIND="SMB" echo -n $"Shutting down $KIND services: " - killproc smbd -TERM + killproc smbd RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/run/smbd.pid echo KIND="NMB" if [ x"$ISNETBIOSDISABLED" != x"Yes" ]; then echo -n $"Shutting down $KIND services: " - killproc nmbd -TERM + killproc nmbd RETVAL2=$? [ $RETVAL2 -eq 0 ] && rm -f /var/run/nmbd.pid [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb diff --git a/packaging/RHEL/setup/winbind.init b/packaging/RHEL/setup/winbind.init index e778e61e9c..a99038f9c7 100644 --- a/packaging/RHEL/setup/winbind.init +++ b/packaging/RHEL/setup/winbind.init @@ -49,7 +49,7 @@ stop() { echo KIND="Winbind" echo -n $"Shutting down $KIND services: " - killproc winbindd -TERM + killproc winbindd RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/run/winbindd.pid && rm -f /var/lock/subsys/winbindd echo "" diff --git a/packaging/RedHat-9/smb.init b/packaging/RedHat-9/smb.init index 79f4f322d0..9b45ebabb3 100755 --- a/packaging/RedHat-9/smb.init +++ b/packaging/RedHat-9/smb.init @@ -30,15 +30,8 @@ case "$1" in stop) echo -n "Shutting down SMB services: " - ## we have to get all the smbd process here instead of just the - ## main parent (i.e. killproc) because it can take a long time - ## for an individual process to process a TERM signal - smbdpids=`ps guax | grep smbd | grep -v grep | awk '{print $2}'` - for pid in $smbdpids; do - kill -TERM $pid - done - ## nmbd is ok to kill using killproc() - killproc nmbd -TERM + killproc smbd + killproc nmbd rm -f /var/lock/subsys/smb echo "" ;; |