From owner-freebsd-stable Tue Oct 15 8:32:54 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 CA55B37B401 for ; Tue, 15 Oct 2002 08:32:53 -0700 (PDT) Received: from lurza.secnetix.de (lurza.secnetix.de [212.66.1.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED7B343E9E for ; Tue, 15 Oct 2002 08:32:52 -0700 (PDT) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (localhost [IPv6:::1]) by lurza.secnetix.de (8.12.5/8.12.5) with ESMTP id g9FFWomC070441 for ; Tue, 15 Oct 2002 17:32:50 +0200 (CEST) (envelope-from oliver.fromme@secnetix.de) Received: (from olli@localhost) by lurza.secnetix.de (8.12.5/8.12.5/Submit) id g9FFWo2o070440; Tue, 15 Oct 2002 17:32:50 +0200 (CEST) Date: Tue, 15 Oct 2002 17:32:50 +0200 (CEST) Message-Id: <200210151532.g9FFWo2o070440@lurza.secnetix.de> From: Oliver Fromme To: freebsd-stable@FreeBSD.ORG Reply-To: freebsd-stable@FreeBSD.ORG Subject: Re: Ifconfig config of gif tunnels In-Reply-To: <200210132154.g9DLsUmc057065@apollo.backplane.com> X-Newsgroups: list.freebsd-stable User-Agent: tin/1.5.4-20000523 ("1959") (UNIX) (FreeBSD/4.6-STABLE (i386)) MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit 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 Matthew Dillon wrote: > 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. Additionally, I think it might be a good idea to make those files schg by default, and teach mergemaster to noschg/schg them if required. Regards Oliver -- Oliver Fromme, secnetix GmbH & Co KG, Oettingenstr. 2, 80538 München Any opinions expressed in this message may be personal to the author and may not necessarily reflect the opinions of secnetix in any way. "All that we see or seem is just a dream within a dream" (E. A. Poe) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message