diff options
| author | Gerald Carter <jerry@samba.org> | 2004-01-16 17:46:38 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-01-16 17:46:38 +0000 |
| commit | a7d0aec2b7ef132b5c631cb26d0a93dd66d0fff3 (patch) | |
| tree | e7532daea8d21ae601093717e25fea597e0c5f2a /packaging | |
| parent | 07d6ed4343d7a2575dc974bfbc498b14784b2dc1 (diff) | |
| download | samba-a7d0aec2b7ef132b5c631cb26d0a93dd66d0fff3.tar.gz | |
BUG 891 & 949: Fedora Packaging Fixes
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/Fedora/samba.spec.tmpl | 7 | ||||
| -rw-r--r-- | packaging/Fedora/smb.init | 8 | ||||
| -rw-r--r-- | packaging/Fedora/winbind.init | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl index ec50cc705b4..90abadce587 100644 --- a/packaging/Fedora/samba.spec.tmpl +++ b/packaging/Fedora/samba.spec.tmpl @@ -214,6 +214,13 @@ if [ "$1" -ge "1" ]; then %{initdir}/smb condrestart >/dev/null 2>&1 fi + +%post swat +# Add swat entry to /etc/services if not already there. +if [ ! "`grep ^\s**swat /etc/services`" ]; then + echo 'swat 901/tcp # Add swat service used via inetd' >> /etc/services +fi + %post common /sbin/chkconfig --add winbind /sbin/ldconfig diff --git a/packaging/Fedora/smb.init b/packaging/Fedora/smb.init index fca823a0642..4182c134085 100644 --- a/packaging/Fedora/smb.init +++ b/packaging/Fedora/smb.init @@ -60,14 +60,16 @@ start() { stop() { KIND="SMB" echo -n $"Shutting down $KIND services: " - killproc smbd + killproc smbd -TERM RETVAL=$? + [ $RETVAL -eq 0 ] && rm -f /var/run/smbd.pid echo KIND="NMB" echo -n $"Shutting down $KIND services: " - killproc nmbd + killproc nmbd -TERM RETVAL2=$? - [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb + [ $RETVAL -eq 0 ] && rm -f /var/run/nmbd.pid + [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb echo "" return $RETVAL } diff --git a/packaging/Fedora/winbind.init b/packaging/Fedora/winbind.init index ced81135b27..05e0eb4d006 100644 --- a/packaging/Fedora/winbind.init +++ b/packaging/Fedora/winbind.init @@ -49,9 +49,11 @@ stop() { echo KIND="Winbind" echo -n $"Shutting down $KIND services: " - killproc winbindd + killproc winbindd -TERM RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbindd + [ $RETVAL -eq 0 ] \ + && && rm -f /var/run/nmbd.pid \ + && rm -f /var/lock/subsys/winbindd echo "" return $RETVAL } |