From ae0931ac45c4060bba77e9da2b9281917f7c58aa Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Mon, 3 Dec 2007 02:24:19 +0000 Subject: - Make rc variables can be properly set by users. Default variables should be handled after load_rc_config per Handbook. For example, if user sets name_pidfile in rc.conf, it does not correctly pass to name_flags because when we set name_flags, it uses our default name_pidfile, but not user's. - Bump PORTREVISION as rc scripts changed. Approved by: portmgr (pav), Xavier Beaudouin (ovs maintainer) --- mail/ovs/Makefile | 1 + mail/ovs/files/ovs.sh.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'mail/ovs') diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile index aaa17333f1c4..e0f6175cab8b 100644 --- a/mail/ovs/Makefile +++ b/mail/ovs/Makefile @@ -7,6 +7,7 @@ PORTNAME= ovs PORTVERSION= 1.02 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.oav.net/openvisp/stats/ diff --git a/mail/ovs/files/ovs.sh.in b/mail/ovs/files/ovs.sh.in index 7bc4eb78f3fe..8702b9caea1f 100644 --- a/mail/ovs/files/ovs.sh.in +++ b/mail/ovs/files/ovs.sh.in @@ -24,14 +24,14 @@ stop_postcmd() rm -f $pidfile } +load_rc_config $name + : ${ovs_enable="NO"} : ${ovs_pidfile="%%DATADIR%%/ovs.pid"} : ${ovs_flags="--logfile /var/log/maillog --daemon-rrd=%%DATADIR%% --ignore-localhost --daemon --daemon-pid=${ovs_pidfile} --rbl-is-spam --greylist --helo --spf --domain-not-found"} : ${ovs_user="%%OVS_USER%%"} : ${ovs_chdir="%%DATADIR%%"} -load_rc_config $name - pidfile=${ovs_pidfile} run_rc_command "$1" -- cgit v1.2.3