From owner-freebsd-hackers@FreeBSD.ORG Thu Jun 18 22:18:47 2009 Return-Path: Delivered-To: hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E138A1065672; Thu, 18 Jun 2009 22:18:47 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.freebsd.org (Postfix) with ESMTP id A2B998FC19; Thu, 18 Jun 2009 22:18:47 +0000 (UTC) (envelope-from des@des.no) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id EB7B46D418; Fri, 19 Jun 2009 00:18:46 +0200 (CEST) Received: by ds4.des.no (Postfix, from userid 1001) id D1268844A4; Fri, 19 Jun 2009 00:18:46 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Doug Barton References: <200906071326.n57DQvSG095104@svn.freebsd.org> <86iqiudm63.fsf@ds4.des.no> <4A3A88BD.5030703@FreeBSD.org> Date: Fri, 19 Jun 2009 00:18:46 +0200 In-Reply-To: <4A3A88BD.5030703@FreeBSD.org> (Doug Barton's message of "Thu, 18 Jun 2009 11:34:37 -0700") Message-ID: <86ab455gop.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: hackers@freebsd.org, Edwin Groothuis Subject: Re: svn commit: r193635 - head/etc X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2009 22:18:48 -0000 Doug Barton writes: > Dag-Erling Sm=C3=B8rgrav writes: > > Great, now mergemaster blew away my ntp.conf and installed this one > > instead. Apparently, it thinks AUTO_UPGRADE means it's fine to > > overwrite an existing file with a new one... > Yes, that's exactly what the option means. The problem comes in > because it's a new file, which means that there is no record of it in > the mtree file, so it does not show up as "changed." Hmm, I'm not sure I follow, since I'm not familiar with the innards of mergemaster, but can you tell it's new? If you can, you can check if there's already a file of the same name before installing the new one? > FWIW, this is one of the reasons that I resisted the idea of using > mtree for this function, and continue to resist the idea of the -U > option being the default. I didn't realize it was the default - but I really, really like it. It makes mergemaster a *lot* easier to use. > There is no way that I can see to have mtree list the files that have > _not_ changed, which would be the safest way to implement this > option. Doesn't sound unsurmountable. > Meanwhile I'm sure you were able to restore from backups Of course (not that there was much to restore - just "server ntp.des.no iburst maxpoll 6"), and now that I know about it, I can list it in IGNORE_FILES along with motd and printcap. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no