From owner-freebsd-rc@FreeBSD.ORG  Fri Aug 27 16:08:40 2004
Return-Path: <owner-freebsd-rc@FreeBSD.ORG>
Delivered-To: freebsd-rc@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6212716A4CE; Fri, 27 Aug 2004 16:08:40 +0000 (GMT)
Received: from fillmore.dyndns.org (port-212-202-50-15.dynamic.qsc.de
	[212.202.50.15])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2541D43D5C; Fri, 27 Aug 2004 16:08:40 +0000 (GMT)
	(envelope-from eikemeier@fillmore-labs.com)
Received: from dhcp-13.local ([172.16.0.13])
	by fillmore.dyndns.org with esmtps (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.42 (FreeBSD))
	id 1C0jHJ-000FeA-78; Fri, 27 Aug 2004 18:08:39 +0200
Date: Fri, 27 Aug 2004 18:08:51 +0200
Content-Type: text/plain; charset=US-ASCII; format=flowed
Mime-Version: 1.0 (Apple Message framework v482)
To: Scot Hetzel <swhetzel@gmail.com>
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
In-Reply-To: <790a9fff0408270824750baf89@mail.gmail.com>
Message-Id: <62D80202-F843-11D8-AC6A-00039312D914@fillmore-labs.com>
Content-Transfer-Encoding: 7bit
User-Agent: KMail/1.5.9
cc: freebsd-rc@freebsd.org
cc: current@freebsd.org
Subject: Re: Patch for mergemaster [was Re: RFC: Alternate patch to have
	true new-style rc.d scripts in ports (without touching localpkg)]
X-BeenThere: freebsd-rc@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussion related to /etc/rc.d design and implementation.
	<freebsd-rc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-rc>,
	<mailto:freebsd-rc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-rc>
List-Post: <mailto:freebsd-rc@freebsd.org>
List-Help: <mailto:freebsd-rc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-rc>,
	<mailto:freebsd-rc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Aug 2004 16:08:40 -0000

Scot Hetzel wrote:

> Several individuals expressed their concern with mergemaster deleting
> scripts from /etc/rc.d.  The main concern is that an administator
> could create their own scripts and place them into /etc/rc.d, then
> either they forget about their script, or another admin is updating
> and they accidently delete the script during the mergemaster process.
>
> Attached is a patch to mergemaster that checks the script files for
> "$FreeBSD: src" during the STALE_RC_FILES check.  If a script has such
> a header, it is assumed to be a stale rc file.  The old behavior of
> checking all scripts is still available when the -s flag is specified
> to mergemaster.

An alternate approach is in PR 64476:
   <http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/64476>

But probably the "$FreeBSD: src" test is more useful, I'm not sure. 
Anyway, you could post this as a follow-up, so that both approaches 
could be compared.
-Oliver