From owner-freebsd-current Mon Jan 29 20: 2:36 2001 Delivered-To: freebsd-current@freebsd.org Received: from guru.mired.org (okc-65-26-235-186.mmcable.com [65.26.235.186]) by hub.freebsd.org (Postfix) with SMTP id 6F44B37B400 for ; Mon, 29 Jan 2001 20:02:17 -0800 (PST) Received: (qmail 44232 invoked by uid 100); 30 Jan 2001 04:02:16 -0000 From: Mike Meyer MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <14966.15560.809818.773206@guru.mired.org> Date: Mon, 29 Jan 2001 22:02:16 -0600 (CST) To: sig@is.akita-u.ac.jp Cc: freebsd-current@FreeBSD.ORG Subject: Re: /etc/shells #include syntax support patch In-Reply-To: References: <20010128101349.2c94539f.steveo@eircom.net> <20010128190227.B25222@spawn.nectar.com> <200101290453.f0T4roq13148@whizzo.transsys.com> <20010129105930.C62046@lflat.vas.mobilix.dk> X-Mailer: VM 6.75 under 21.1 (patch 10) "Capitol Reef" XEmacs Lucid X-face: "5Mnwy%?j>IIV\)A=):rjWL~NB2aH[}Yq8Z=u~vJ`"(,&SiLvbbz2W`;h9L,Yg`+vb1>RG% *h+%X^n0EZd>TM8_IB;a8F?(Fb"lw'IgCoyM.[Lg#r\ Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG sig@is.akita-u.ac.jp types: > At 29 Jan 2001 11:49:36 +0100, > Dag-Erling Smorgrav wrote: > > No. Mergemaster doesn't care about the contents of the file, only > > about its $FreeBSD$ tag. As long as this stays the same, it'll leave > > the file alone. If you remove the $FreeBSD$ tag in the installed file > > or someone commits to src/etc/shells, mergemaster will prompt you. > I want mergemaster(8) to have a list not to compare. It is not > necessary for mergemaster(8) to compare host specific files, for > example, /etc/hosts, /etc/printcap and /etc/shells, to their > originals in /usr/src. I want that system managers for local > hosts can decide which files follow the source and which files > do not. There was some discussion of about this on -questions (I think it was) a while back, and the author commented on some things he was working on. You might look through those, then nudge him about it. http://www.mired.org/home/mwm/ Independent WWW/Perforce/FreeBSD/Unix consultant, email for more information. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message