From oberman@es.net  Mon Aug 29 18:58:26 2005
Return-Path: <oberman@es.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B726F16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <oberman@es.net>
Reply-To: Kevin Oberman <oberman@es.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: mergemaster default for deleting "stale" rc.d scripts is bad
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         85449
>Category:       bin
>Synopsis:       [patch] mergemaster(8) default for deleting "stale" rc.d scripts is bad
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 29 19:00:40 GMT 2005
>Closed-Date:    Wed Dec 21 09:04:59 GMT 2005
>Last-Modified:  Wed Dec 21 09:04:59 GMT 2005
>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:
Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: krion 
Responsible-Changed-When: Fri Sep 23 12:03:47 GMT 2005 
Responsible-Changed-Why:  
Over to mergemaster maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85449 
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Wed Dec 21 09:04:38 UTC 2005 
State-Changed-Why:  

Agreed! Thanks for bringing this to my attention. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85449 
>Unformatted:
