From owner-freebsd-current@FreeBSD.ORG Thu Sep 29 22:45:51 2005 Return-Path: X-Original-To: current@freebsd.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A944916A41F; Thu, 29 Sep 2005 22:45:51 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (comp.chem.msu.su [158.250.32.97]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05FAD43D4C; Thu, 29 Sep 2005 22:45:50 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (localhost [127.0.0.1]) by comp.chem.msu.su (8.13.3/8.13.3) with ESMTP id j8TMjm0H011105; Fri, 30 Sep 2005 02:45:49 +0400 (MSD) (envelope-from yar@comp.chem.msu.su) Received: (from yar@localhost) by comp.chem.msu.su (8.13.3/8.13.3/Submit) id j8TMjmvT011100; Fri, 30 Sep 2005 02:45:48 +0400 (MSD) (envelope-from yar) Date: Fri, 30 Sep 2005 02:45:48 +0400 From: Yar Tikhiy To: hackers@freebsd.org, current@freebsd.org Message-ID: <20050929224548.GB3035@comp.chem.msu.su> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.9i Cc: Subject: A smarter mergemaster X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Sep 2005 22:45:51 -0000 Folks, I've got tired of dumb default choices mergemaster(8) offers and modified it to be a bit smarter. Upgrading /etc often, as when following CURRENT, is much less pain to me now. The modified mergemaster is available from P4 for now since I'd like to have it tested well before it hits the src tree. The path is //depot/user/yar/hack/usr.sbin/mergemaster, also accessible via web as http://perforce.freebsd.org/depotTreeBrowser.cgi?FSPC=//depot/user/yar/hack/usr.sbin/mergemaster Since mergemaster still is a shell script, you can just grab and run it. The manual page there has been updated as well. The fruitiest features are as follows: - mergemaster no longer teases you with pauses in -v mode. Use -N (novice mode) if you still want the pauses. - "Stale" rc.d files can be rm'ed or kept on individual basis. - There is expert mode, -E. In this mode, mergemaster offers more dangerous defaults, mostly [install] or [delete] depending on the question. So you can just keep hitting Enter most of the time if your /etc is just slightly modified. In addition, you get the 's' choice when in a subdirectory: auto-install all files from this subdirectory -- much useful to deal with sweeping changes to rc.d or periodic. Feedback is welcome. And please please don't skip making a backup of your /etc before running mergemaster! I can't be responsible for its loss due to bugs in my code or whatever. -- Yar