From a4ab3da92c854686a4db357ea744c94dec369c57 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Fri, 28 Dec 2012 13:08:18 +0000 Subject: Minimal improvement on the init script. (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342) --- net-dialup/freeradius/ChangeLog | 6 +++++- net-dialup/freeradius/files/radius.conf-r3 | 8 ++++++-- net-dialup/freeradius/files/radius.init-r3 | 23 ++++++++++++----------- 3 files changed, 23 insertions(+), 14 deletions(-) (limited to 'net-dialup') diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog index f6eeb23f6cbb..d331c6615a7a 100644 --- a/net-dialup/freeradius/ChangeLog +++ b/net-dialup/freeradius/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/freeradius # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.110 2012/10/22 02:58:59 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.111 2012/12/28 13:08:18 flameeyes Exp $ + + 28 Dec 2012; Diego E. Pettenò files/radius.conf-r3, + files/radius.init-r3: + Minimal improvement on the init script. 22 Oct 2012; Diego E. Pettenò files/radius.init-r3: Remove need net line. diff --git a/net-dialup/freeradius/files/radius.conf-r3 b/net-dialup/freeradius/files/radius.conf-r3 index 2b29f0f940fd..3c1bf3228cb0 100644 --- a/net-dialup/freeradius/files/radius.conf-r3 +++ b/net-dialup/freeradius/files/radius.conf-r3 @@ -8,5 +8,9 @@ pidfile=/var/run/radiusd/radiusd.pid # Change these values if you change them in /etc/raddb/radiusd.conf -# RADIUSD_USER=radius -# RADIUSD_GROUP=radius +#RADIUSD_USER=radius +#RADIUSD_GROUP=radius + +# If you set up logging to syslog in /etc/raddb/radiusd.conf, you want +# to uncomment the following line. +#rc_use="logger" diff --git a/net-dialup/freeradius/files/radius.init-r3 b/net-dialup/freeradius/files/radius.init-r3 index 11dbd461bc6b..73a368a9505e 100644 --- a/net-dialup/freeradius/files/radius.init-r3 +++ b/net-dialup/freeradius/files/radius.init-r3 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v 1.2 2012/10/22 02:58:59 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v 1.3 2012/12/28 13:08:17 flameeyes Exp $ command=/usr/sbin/radiusd command_args="${RADIUSD_OPTS}" @@ -9,21 +9,22 @@ pidfile="${pidfile:-/var/run/radiusd/radiusd.pid}" extra_started_commands="reload" depend() { - use dns + need localmount + use dns } start_pre() { - if [ ! -f /etc/raddb/radiusd.conf ] ; then - eerror "No /etc/raddb/radiusd.conf file exists!" - return 1 - fi + if [ ! -f /etc/raddb/radiusd.conf ] ; then + eerror "No /etc/raddb/radiusd.conf file exists!" + return 1 + fi - checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \ - $(dirname ${pidfile}) /var/log/radius + checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \ + $(dirname ${pidfile}) /var/log/radius } reload() { - ebegin "Reloading radiusd" - kill -HUP $(cat /var/run/radiusd/radiusd.pid) - eend $? + ebegin "Reloading radiusd" + kill -HUP $(cat ${pidfile}) + eend $? } -- cgit v1.2.3-65-gdbad