From owner-freebsd-bugs@FreeBSD.ORG Fri Mar 19 09:30:12 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E49C516A4CE for ; Fri, 19 Mar 2004 09:30:11 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C627543D2D for ; Fri, 19 Mar 2004 09:30:11 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i2JHUBbv017253 for ; Fri, 19 Mar 2004 09:30:11 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i2JHUBNj017252; Fri, 19 Mar 2004 09:30:11 -0800 (PST) (envelope-from gnats) Resent-Date: Fri, 19 Mar 2004 09:30:11 -0800 (PST) Resent-Message-Id: <200403191730.i2JHUBNj017252@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Oliver Eikemeier Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E338616A4D0 for ; Fri, 19 Mar 2004 09:25:14 -0800 (PST) Received: from postman.arcor.de (postman4.arcor-online.net [151.189.0.154]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06BDE43D1D for ; Fri, 19 Mar 2004 09:25:09 -0800 (PST) (envelope-from eikemeier@fillmore-labs.com) Received: from fillmore.dyndns.org (port-212-202-51-138.reverse.qsc.de [212.202.51.138]) (authenticated bits=0)i2JHP7D2017653 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Fri, 19 Mar 2004 18:25:07 +0100 (MET) Received: from [172.16.0.2] (helo=fillmore-labs.com) by fillmore.dyndns.org with esmtp (Exim 4.30; FreeBSD) id 1B4Nk1-0008Df-2E for FreeBSD-gnats-submit@FreeBSD.org; Fri, 19 Mar 2004 18:25:05 +0100 Message-Id: <405B2CF4.2090704@fillmore-labs.com> Date: Fri, 19 Mar 2004 18:25:08 +0100 From: Oliver Eikemeier To: FreeBSD-gnats-submit@FreeBSD.org Subject: bin/64476: [PATCH] mergemaster: support for keeping customized rc.d scripts X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2004 17:30:12 -0000 >Number: 64476 >Category: bin >Synopsis: [PATCH] mergemaster: support for keeping customized rc.d scripts >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 19 09:30:11 PST 2004 >Closed-Date: >Last-Modified: >Originator: Oliver Eikemeier >Release: FreeBSD 5.2.1-RELEASE-p1 i386 >Organization: Fillmore Labs - http://www.fillmore-labs.com >Environment: System: FreeBSD nuuk.fillmore-labs.com 5.2.1-RELEASE-p1 >Description: Recently mergemaster acquired the habit to flag all unknown rc.d scripts as `stale' and offers to delete them. While it is nice, that scripts removed from cvs doesn't interrupt the boot process, this also affects any customized scripts a user might have put there. Currently the only option is to answer `no' to the offer of deleting `stale' rc.d scripts, since not every script is treated individually. This patch adds an variable CUSTOM_RC_FILES to mergemasterrc which can contain glob(1)-style patterns of scripts which should be kept. >How-To-Repeat: >Fix: Index: mergemaster.8 =================================================================== RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.8,v retrieving revision 1.28 diff -u -r1.28 mergemaster.8 --- mergemaster.8 2 May 2003 06:28:30 -0000 1.28 +++ mergemaster.8 19 Mar 2004 17:02:07 -0000 @@ -351,6 +351,9 @@ # Don't compare the old and new motd files #IGNORE_MOTD=yes # +# Customized scripts in /etc/rc.d that should be preserved +#CUSTOM_RC_FILES= +# # Specify the path to scripts to run before the comparison starts, # and/or after the script has finished its work #MM_PRE_COMPARE_SCRIPT= Index: mergemaster.sh =================================================================== RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v retrieving revision 1.51 diff -u -r1.51 mergemaster.sh --- mergemaster.sh 7 Mar 2004 10:10:19 -0000 1.51 +++ mergemaster.sh 19 Mar 2004 17:14:50 -0000 @@ -790,7 +790,9 @@ cd "${DESTDIR}/etc/rc.d" && for file in *; do if [ ! -e "${TEMPROOT}/etc/rc.d/${file}" ]; then - STALE_RC_FILES="${STALE_RC_FILES} ${file}" + if echo ${CUSTOM_RC_FILES} | grep -Fwvq "${file}"; then + STALE_RC_FILES="${STALE_RC_FILES} ${file}" + fi fi done case "${STALE_RC_FILES}" in >Release-Note: >Audit-Trail: >Unformatted: