From owner-freebsd-bugs@FreeBSD.ORG Mon Aug 29 19:00:47 2005 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org 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 CEF3F16A41F for ; Mon, 29 Aug 2005 19:00:47 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB09143D69 for ; Mon, 29 Aug 2005 19:00:40 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7TJ0edt087180 for ; Mon, 29 Aug 2005 19:00:40 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7TJ0etw087176; Mon, 29 Aug 2005 19:00:40 GMT (envelope-from gnats) Resent-Date: Mon, 29 Aug 2005 19:00:40 GMT Resent-Message-Id: <200508291900.j7TJ0etw087176@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, Kevin Oberman Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B726F16A41F for ; Mon, 29 Aug 2005 18:58:26 +0000 (GMT) (envelope-from oberman@es.net) Received: from postal2.es.net (postal2.es.net [198.128.3.206]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8240043D45 for ; Mon, 29 Aug 2005 18:58:26 +0000 (GMT) (envelope-from oberman@es.net) Received: from puppeteer.es.net ([198.128.27.63]) by postal2.es.net (Postal Node 2) with ASMTP id IBA74465 for ; Mon, 29 Aug 2005 11:58:25 -0700 Received: by puppeteer.es.net (Postfix, from userid 1001) id BDECB11A2D; Mon, 29 Aug 2005 11:58:24 -0700 (PDT) Message-Id: <20050829185824.BDECB11A2D@puppeteer.es.net> Date: Mon, 29 Aug 2005 11:58:24 -0700 (PDT) From: Kevin Oberman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: conf/85449: mergemaster default for deleting "stale" rc.d scripts is bad X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Kevin Oberman List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2005 19:00:48 -0000 >Number: 85449 >Category: conf >Synopsis: mergemaster default for deleting "stale" rc.d scripts is bad >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: Mon Aug 29 19:00:40 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Kevin Oberman >Release: FreeBSD 7.0-CURRENT i386 >Organization: ESnet--The Energy Sciences Network >Environment: System: FreeBSD puppeteer.es.net 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Sat Aug 27 08:41:06 PDT 2005 oberman@puppeteer.es.net:/usr/obj/usr/src/sys/IBM-T30-D i386 >Description: When files not in the source tree are found in /etc/rc.d, they are assumed to be stale and the script asks of they should be removed. The default is to remove them. To make it worse, any response other then 'n' or 'N' (including 'no') will delete the files. I use profile.sh which must be in /etc/rc.d to function properly and I am getting tired of inadvertantly deleting it on my current system. If is better to default to NOT taking destructive actions. >How-To-Repeat: Run mergemaster(8) with any non-standard file in /etc/rc.d >Fix: This is sub-optimal as 'yes' will be read as 'n', but at least it is "safe". If I had a bit more time, I would have taken care of this, as well. --- usr.sbin/mergemaster/mergemaster.sh.orig Mon Aug 29 11:46:21 2005 +++ usr.sbin/mergemaster/mergemaster.sh Mon Aug 29 11:46:35 2005 @@ -809,16 +809,16 @@ case "${AUTO_RUN}" in '') echo '' - echo -n ' *** Delete them now? [y] ' + echo -n ' *** Delete them now? [n] ' read DELETE_STALE_RC_FILES case "${DELETE_STALE_RC_FILES}" in - [nN]) - echo ' *** Files will not be deleted' - ;; - *) + [yY]) echo ' *** Deleting ... ' rm ${STALE_RC_FILES} echo ' done.' + ;; + *) + echo ' *** Files will not be deleted' ;; esac sleep 2 >Release-Note: >Audit-Trail: >Unformatted: