From owner-freebsd-bugs@FreeBSD.ORG Mon Oct 24 13:30:17 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 4EE9016A41F for ; Mon, 24 Oct 2005 13:30:17 +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 9B2E643D53 for ; Mon, 24 Oct 2005 13:30:16 +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 j9ODUGbp086710 for ; Mon, 24 Oct 2005 13:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9ODUGnj086709; Mon, 24 Oct 2005 13:30:16 GMT (envelope-from gnats) Resent-Date: Mon, 24 Oct 2005 13:30:16 GMT Resent-Message-Id: <200510241330.j9ODUGnj086709@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, "Simson L. Garfinkel" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A70A16A41F for ; Mon, 24 Oct 2005 13:22:04 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0686943D45 for ; Mon, 24 Oct 2005 13:22:04 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j9ODM3es006456 for ; Mon, 24 Oct 2005 13:22:03 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id j9ODM3n1006455; Mon, 24 Oct 2005 13:22:03 GMT (envelope-from nobody) Message-Id: <200510241322.j9ODM3n1006455@www.freebsd.org> Date: Mon, 24 Oct 2005 13:22:03 GMT From: "Simson L. Garfinkel" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: misc/87921: mergemaster needs to be smarter about config files X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 13:30:17 -0000 >Number: 87921 >Category: misc >Synopsis: mergemaster needs to be smarter about config files >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Oct 24 13:30:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Simson L. Garfinkel >Release: 6.0-RC1 >Organization: Harvard University >Environment: FreeBSD h.ex.com 6.0-RC1 FreeBSD 6.0-RC1 #0: Thu Oct 20 09:53:07 EDT 2005 simsong@h.ex.com:/usr/obj/usr/src/sys/GENERIC i386 >Description: Upgrading a FreeBSD machine takes longer than it should because of the large number of mindless mergmaster questions that are asked. In many cases, the questions that are asked do not need to be asked, because the file from the prevous release has not been modified in any way. For example, last night I upgraded a machine from 5.4 to 6.0-RC1 and was asked if I would like to merge in my changes to the file /etc/defaults/pccard.conf. However, I had not made any changes to this file. The file had changed between releases, but the version that I had installed was unchanged from my original distribution. >How-To-Repeat: Upgrade a machine from 5.4 to 6.0-RC1. >Fix: An easy solution to this problem would be for mergemaster to consult the mtree system and simply upgrade any file whose contents had not been modified. If you feel the need to special case certain files, such as /etc/passwd, you could do that. But files like /etc/defaults/pccard.conf should be silently upgraded if they are not modified between upgrades. >Release-Note: >Audit-Trail: >Unformatted: