From owner-cvs-all@FreeBSD.ORG Fri Feb 12 20:07:06 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F6A0106568D for ; Fri, 12 Feb 2010 20:07:06 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id ECBA58FC19 for ; Fri, 12 Feb 2010 20:07:05 +0000 (UTC) Received: (qmail 17107 invoked by uid 399); 12 Feb 2010 20:07:05 -0000 Received: from localhost (HELO ?192.168.0.145?) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 12 Feb 2010 20:07:05 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4B75B4FC.4080202@FreeBSD.org> Date: Fri, 12 Feb 2010 12:07:24 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.7) Gecko/20100111 Thunderbird/3.0.1 MIME-Version: 1.0 To: Pav Lucistnik References: <201002121043.o1CAhFJ0099892@repoman.freebsd.org> In-Reply-To: <201002121043.o1CAhFJ0099892@repoman.freebsd.org> X-Enigmail-Version: 1.0.1 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Sunpoet Hsieh , cvs-ports@FreeBSD.org, Mykola Dzham , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/audio/icecast2 Makefile ports/audio/icecast2/files icecast2.sh.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2010 20:07:06 -0000 On 2/12/2010 2:43 AM, Pav Lucistnik wrote: > pav 2010-02-12 10:43:15 UTC > > FreeBSD ports repository > > Modified files: > audio/icecast2 Makefile > audio/icecast2/files icecast2.sh.in > Log: > - Correct login/LOGIN in rc script > - Minor cleanup > > PR: ports/143532 http://www.FreeBSD.org/cgi/query-pr.cgi?pr=143532 > Submitted by: Mykola Dzham > Approved by: Sunpoet Hsieh (maintainer) > > Revision Changes Path > 1.63 +1 -2 ports/audio/icecast2/Makefile > 1.5 +2 -2 ports/audio/icecast2/files/icecast2.sh.in > > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/audio/icecast2/Makefile.diff?&r1=1.62&r2=1.63&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/audio/icecast2/files/icecast2.sh.in.diff?&r1=1.4&r2=1.5&f=h The change to LOGIN is a good catch, thanks for doing that. There are a few other problems with this script however. Most importantly, if the service is running as a user other than root (which the comment implies) then the current REQUIRE/BEFORE should be changed to just "REQUIRE: LOGIN". Also, if the xml file really is required then the -c option should be added to command_args so that a user does not accidentally delete it. If your intention is to allow the user to specify a different configuration file that should be down with its own icecast_ option. You would then move the required_files definition to after load_rc_config and the default variable assignments. Something like this: load_rc_config $name : ${icecast_enable="NO"} : ${icecast_conf:="%%PREFIX%%/etc/$name.xml"} required_files="$icecast_conf" Less importantly it's preferred that the name of the script, the PROVIDE line, and $name all match. For some reason the first 2 here are icecast2, while name=icecast. Is there a reason they cannot match? If not, this should be adjusted at some point in the future, but it's not critical. hth, Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/