Date: Wed, 30 Apr 2008 12:18:09 +0200 (CEST) From: Ruben van Staveren <ruben@verweg.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/123254: let mu-conference honour different pid file location Message-ID: <200804301018.m3UAI9Ft007781@helium.verweg.com> Resent-Message-ID: <200804301020.m3UAK2P2017346@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123254
>Category: ports
>Synopsis: let mu-conference honour different pid file location
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 30 10:20:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Ruben van Staveren
>Release: FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD helium.verweg.com 7.0-STABLE FreeBSD 7.0-STABLE #21: Tue Apr 22 12:41:05 CEST 2008 root@helium.verweg.com:/usr/obj/usr/cvsup/7-stable/src/sys/HELIUM-SMP i386
>Description:
etc/rc.d/mu-conference sets pidfile before the rc.d configuration is read, making it a non operation
>How-To-Repeat:
set pidfile location in rc.conf and see that it is not honoured
>Fix:
move pidfile stuff after rc configuration loading
diff -Nur mu-conference.orig/files/mu-conference.in mu-conference/files/mu-conference.in
--- mu-conference.orig/files/mu-conference.in 2008-04-30 11:20:23.000000000 +0200
+++ mu-conference/files/mu-conference.in 2008-04-30 11:21:24.000000000 +0200
@@ -25,7 +25,6 @@
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/mu-conference"
-pidfile=${mu_conference_pidfile:-"%%JABBER_PIDDIR%%/mu-conference.pid"}
stop_postcmd="mu_conference_stop_post"
@@ -38,7 +37,9 @@
: ${mu_conference_config="%%PREFIX%%/etc/muc.xml"}
: ${mu_conference_enable="NO"}
: ${mu_conference_user="%%JABBER_USER%%"}
+: ${mu_conference_pidfile="%%JABBER_PIDDIR%%/mu-conference.pid"}
+pidfile=${mu_conference_pidfile}
command_args="-c ${mu_conference_config} -B >/dev/null 2>&1"
run_rc_command "$1"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804301018.m3UAI9Ft007781>