From owner-freebsd-current@freebsd.org Fri Aug 3 05:43:14 2018 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B076105E1C0 for ; Fri, 3 Aug 2018 05:43:14 +0000 (UTC) (envelope-from bsd-lists@BSDforge.com) Received: from udns.ultimatedns.net (static-24-113-41-81.wavecable.com [24.113.41.81]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E701B7181C for ; Fri, 3 Aug 2018 05:43:13 +0000 (UTC) (envelope-from bsd-lists@BSDforge.com) Received: from udns.ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.14.9/8.14.9) with ESMTP id w735h6gJ093162; Thu, 2 Aug 2018 22:43:13 -0700 (PDT) (envelope-from bsd-lists@BSDforge.com) X-Mailer: UDNSMS MIME-Version: 1.0 Cc: "RW" , In-Reply-To: From: "Chris H" Reply-To: bsd-lists@BSDforge.com To: "Niclas Zeising" Subject: Re: ntpd as ntpd user question Date: Thu, 02 Aug 2018 22:43:12 -0700 Message-Id: <1bd91aa67e408dd8f275225325edccd9@udns.ultimatedns.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.27 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: Fri, 03 Aug 2018 05:43:14 -0000 On Mon, 23 Jul 2018 12:57:28 +0200 "Niclas Zeising" said > On 07/21/18 19:56, RW wrote: > > On Sat, 21 Jul 2018 11:14:45 -0600 > > Ian Lepore wrote: > >=20 > >=20 > >> There's a "pre-world" stage of mergemaster (-Fp option I think) which > >> isn't needed often, but one of the times it is needed is apparently > >> when new user ids are added=2E > >=20 > > I wish mergemaster had an option to just add new users and groups, > > rather than merging the files=2E >=20 > etcupdate is usually pretty good at automatically merge updates to files= =20 > without user interaction, even when the files are locally edited as=20 > well=2E For instance, I had no problem merging /etc/master=2Epasswd and=20 > /etc/group for the ntp change=2E > Regards > --=20 > Niclas FWIW I found mergemaster intimidating when I was first starting out=2E Not because I didn't understand patch(1)/diff(1)=2E I was well familiar there=2E But I found it unintuitive=2E Despite the messages regarding it's usage=2E Anyway=2E I finally developed a strategy that worked for me=2E I start out with the standard mergemaster -p then the installworld But I implement the following mergemster, thusly mergemaster -vF It dispenses with asking about all the files that only have revision changes, and date differences, and just updates them, the -v portion, just keeps "enlightened" as to wtf is actually happening during the process=2E Then all that's left are just some 5-9 files I need to deal with, with mergemaster informing me that by default, it'll leave them for me, to look at later=2E To which I reply Y=2E Done=2E Knowing diff/patch, makes the resulting unmerged files a trivial task, requiring perhaps 5-10 minutes while still at the console=2E Then I reboot into the new system=2E HTH --Chris > _______________________________________________ > freebsd-current@freebsd=2Eorg mailing list > https://lists=2Efreebsd=2Eorg/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd=2Eorg= "