From owner-freebsd-current@freebsd.org Mon Jul 23 19:34:35 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 57DC110533B3 for ; Mon, 23 Jul 2018 19:34:35 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [144.76.30.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.bsd4all.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EAD4E8B680 for ; Mon, 23 Jul 2018 19:34:34 +0000 (UTC) (envelope-from herbert@gojira.at) Date: Mon, 23 Jul 2018 21:34:26 +0200 Message-ID: <87r2jtiw59.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: bob prohaska Cc: freebsd-current@freebsd.org Subject: Re: ntpd as ntpd user question In-Reply-To: <20180723045552.GA44941@www.zefox.net> References: <5b90c49f-4616-9ef7-28a1-6445137245ef@nomadlogic.org> <1532191655.1344.80.camel@freebsd.org> <4b7acbd2-0230-345c-4370-24a72d0b492a@nomadlogic.org> <1532193285.1344.83.camel@freebsd.org> <20180721174722.GA40167@www.zefox.net> <1532196850.1344.87.camel@freebsd.org> <20180721220925.GA40238@www.zefox.net> <20180721234941.2ojf76kxxqfhnys7@mail.bsd4all.net> <20180723045552.GA44941@www.zefox.net> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/27.0 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII 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: Mon, 23 Jul 2018 19:34:35 -0000 On Mon, 23 Jul 2018 06:55:52 +0200, bob prohaska wrote: > > On Sun, Jul 22, 2018 at 01:49:41AM +0200, Herbert J. Skuhra wrote: > > On Sat, Jul 21, 2018 at 03:09:26PM -0700, bob prohaska wrote: > > > > The failure is a little surprising, is ntpd a reserved name? > > > > Why? You obviously entered the string "ntpd" instead of an integer when > > asked for the uid!? > > > > Sigh...you're right. Must have been sleepier than I thought. > > > > The machine is re-running buildworld/installworld from a clean start, > > > so presumably it'll halt over the same error again. When that happens, > > > what's the simplest way to recover? Mergemaster is a big hammer, something > > > less comprehensive might suffice, even manual editing of files. > > > > In this case 'mergemaster -p' is enough. > > > > An example or two on the use of mergemaster might be a considerable help. There's something > very basic that I don't understand. > > What is the correct response to the prompts for this simple case? The output displayed > is said to be differences, so the "temporary" file's nature isn't self-evident. It looks > as if the most obvious option is m, followed by eb, but that leaves me editing by hand, > which is what I thought mergemaster was supposed to avoid. Yes, first you press m. Then you will see differences of installed file (left) and new file (right). Then you press either l or r: l | 1: choose left diff r | 2: choose right diff If the diff tries to remove/add to many lines you can: el: edit left diff er: edit right diff And if done you can view the merged file (v) before installing (i) it. I am sure, someone can explain it better! :) -- Herbert