From owner-freebsd-stable Sun Oct 13 15:55:14 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8987A37B401 for ; Sun, 13 Oct 2002 15:55:12 -0700 (PDT) Received: from sccrmhc03.attbi.com (sccrmhc03.attbi.com [204.127.202.63]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCF1F43E77 for ; Sun, 13 Oct 2002 15:55:11 -0700 (PDT) (envelope-from crist.clark@attbi.com) Received: from blossom.cjclark.org ([12.234.91.48]) by sccrmhc03.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20021013225511.TYDV24958.sccrmhc03.attbi.com@blossom.cjclark.org>; Sun, 13 Oct 2002 22:55:11 +0000 Received: from blossom.cjclark.org (localhost. [127.0.0.1]) by blossom.cjclark.org (8.12.3/8.12.3) with ESMTP id g9DMtAWn017320; Sun, 13 Oct 2002 15:55:10 -0700 (PDT) (envelope-from crist.clark@attbi.com) Received: (from cjc@localhost) by blossom.cjclark.org (8.12.3/8.12.3/Submit) id g9DMt9lv017319; Sun, 13 Oct 2002 15:55:09 -0700 (PDT) X-Authentication-Warning: blossom.cjclark.org: cjc set sender to crist.clark@attbi.com using -f Date: Sun, 13 Oct 2002 15:55:09 -0700 From: "Crist J. Clark" To: Matthew Dillon Cc: Trish Lynch , Adrian Wontroba , chris scott , freebsd-stable@FreeBSD.ORG Subject: Re: Ifconfig config of gif tunnels Message-ID: <20021013225509.GA90575@blossom.cjclark.org> Reply-To: cjclark@alum.mit.edu References: <20021013172810.A19177@titus.hanley.stade.co.uk> <20021013130138.G523-100000@femme.sapphite.org> <20021013214642.GB90169@blossom.cjclark.org> <200210132154.g9DLsUmc057065@apollo.backplane.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200210132154.g9DLsUmc057065@apollo.backplane.com> User-Agent: Mutt/1.4i X-URL: http://people.freebsd.org/~cjc/ Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Oct 13, 2002 at 02:54:30PM -0700, Matthew Dillon wrote: > > :Ewww. That kind of defeats the whole purpose of mergemaster(8). The > :whole idea is for a human to sit at the console and decide what > :changes need to be made. With your system, you'll lose any changes to > :master.passwd or group (like the recent addition of the sshd > :user/group). (Although I'll admit that changing the hosts file is one > :that I wouldn't mind skipping everytime.) You might as well just copy > :your files out of the way, run the make commands mergemaster(8) does, > :and then move the files back. Mergemaster(8) doesn't really buy you > :anything the way you are using it. > : > :Actually, you probably really should be using the '-a' option to > :mergemaster(8), and then go back later to see what else you need to > :update. > :-- > :Crist J. Clark | cjclark@alum.mit.edu > > I would like mergemaster a whole lot more if: > > (1) It just overwrote system files that users are not supposed to > change anyway, like files in /etc/defaults and the /etc/rc* > files. I've always felt lists of "default clobbers" and "default skips" would be nice to have. > (2) It cleared the window before each presentation, so I don't > have to search around the window to find the filename and/or > diff that it's currently asking me to do something about > (this is especially annoying for small files). How 'bout, Index: mergemaster.sh =================================================================== RCS file: /export/freebsd/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v retrieving revision 1.37 diff -u -r1.37 mergemaster.sh --- mergemaster.sh 5 Aug 2002 08:47:52 -0000 1.37 +++ mergemaster.sh 13 Oct 2002 22:52:50 -0000 @@ -111,9 +111,7 @@ "${HANDLE_COMPFILE}" = "NOT V" ]; do if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then - echo '' - echo ' ====================================================================== ' - echo '' + clear ( echo '' echo " *** Displaying differences between ${COMPFILE} and installed version:" > (3) It didn't try to display the whole diff initially, causing > a pipe-to-(less or more) that I then have to quit out of > before I can tell it to install / delete. Blech. What would you like it to do here? Nothing better leaps to my mind. Having to do something to see the diff seems even more annoying to me. -- Crist J. Clark | cjclark@alum.mit.edu | cjclark@jhu.edu http://people.freebsd.org/~cjc/ | cjc@freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message