- fixed initscript problem (rhbz#292521)

This commit is contained in:
Thomas Woerner 2007-09-17 15:10:47 +00:00
parent 279eeee6af
commit 632cefe277
2 changed files with 8 additions and 5 deletions

View File

@ -1,6 +1,6 @@
diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
--- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb 2002-09-14 01:13:58.000000000 +0200 --- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb 2002-09-14 01:13:58.000000000 +0200
+++ freeradius-1.1.7/redhat/rc.radiusd-redhat 2007-08-28 15:21:59.000000000 +0200 +++ freeradius-1.1.7/redhat/rc.radiusd-redhat 2007-09-17 17:02:58.000000000 +0200
@@ -20,6 +20,14 @@ @@ -20,6 +20,14 @@
# Copyright (C) 2001 The FreeRADIUS Project http://www.freeradius.org # Copyright (C) 2001 The FreeRADIUS Project http://www.freeradius.org
# #
@ -40,7 +40,7 @@ diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/r
ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
;; ;;
stop) stop)
+ [ $running -ne 0 ] || exit 0 + [ $running -eq 0 ] || exit 0
echo -n $"Stopping RADIUS server: " echo -n $"Stopping RADIUS server: "
killproc $RADIUSD killproc $RADIUSD
RETVAL=$? RETVAL=$?
@ -48,7 +48,7 @@ diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/r
RETVAL=$? RETVAL=$?
;; ;;
reload) reload)
+ [ $running -ne 0 ] && exit 7 + [ $running -eq 0 ] || exit 7
echo -n $"Reloading RADIUS server: " echo -n $"Reloading RADIUS server: "
killproc $RADIUSD -HUP killproc $RADIUSD -HUP
RETVAL=$? RETVAL=$?
@ -69,7 +69,7 @@ diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/r
- RETVAL=$? - RETVAL=$?
- fi - fi
+ condrestart|try-restart) + condrestart|try-restart)
+ [ ! -f $LOCKF ] && exit 7 + [ $running -eq 0 ] || exit 7
+ $0 stop + $0 stop
+ sleep 3 + sleep 3
+ $0 start + $0 start

View File

@ -1,7 +1,7 @@
Summary: High-performance and highly configurable free RADIUS server Summary: High-performance and highly configurable free RADIUS server
Name: freeradius Name: freeradius
Version: 1.1.7 Version: 1.1.7
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.freeradius.org/ URL: http://www.freeradius.org/
@ -301,6 +301,9 @@ fi
%changelog %changelog
* Mon Sep 17 2007 Thomas Woerner <twoerner@redhat.com> 1.1.7-3
- fixed initscript problem (rhbz#292521)
* Tue Aug 28 2007 Thomas Woerner <twoerner@redhat.com> 1.1.7-2 * Tue Aug 28 2007 Thomas Woerner <twoerner@redhat.com> 1.1.7-2
- fixed initscript for LSB (rhbz#243671, rhbz#243928) - fixed initscript for LSB (rhbz#243671, rhbz#243928)
- fixed license tag - fixed license tag