From owner-freebsd-current@freebsd.org Tue Jul 24 03:10:46 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 001CC103CD68 for ; Tue, 24 Jul 2018 03:10:45 +0000 (UTC) (envelope-from fbsd@www.zefox.net) Received: from www.zefox.net (www.zefox.net [50.1.20.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "www.zefox.org", Issuer "www.zefox.org" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4EEE47BC8B; Tue, 24 Jul 2018 03:10:44 +0000 (UTC) (envelope-from fbsd@www.zefox.net) Received: from www.zefox.net (localhost [127.0.0.1]) by www.zefox.net (8.15.2/8.15.2) with ESMTPS id w6O3B0D3049657 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 23 Jul 2018 20:11:01 -0700 (PDT) (envelope-from fbsd@www.zefox.net) Received: (from fbsd@localhost) by www.zefox.net (8.15.2/8.15.2/Submit) id w6O3Axfs049644; Mon, 23 Jul 2018 20:10:59 -0700 (PDT) (envelope-from fbsd) Date: Mon, 23 Jul 2018 20:10:58 -0700 From: bob prohaska To: Ian Lepore Cc: "Herbert J. Skuhra" , freebsd-current@freebsd.org, bob prohaska Subject: Re: ntpd as ntpd user question Message-ID: <20180724031058.GC47869@www.zefox.net> References: <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> <87r2jtiw59.wl-herbert@gojira.at> <20180724015428.GB47869@www.zefox.net> <1532399159.1344.211.camel@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1532399159.1344.211.camel@freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) 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: Tue, 24 Jul 2018 03:10:46 -0000 On Mon, Jul 23, 2018 at 08:25:59PM -0600, Ian Lepore wrote: > On Mon, 2018-07-23 at 18:54 -0700, bob prohaska wrote: > > at sdiff, the learning curve proved very steep. Too steep, in fact. > > > > I'm going to try a more incremental approach.? > > > > Thank you _very_ much! > > > > bob prohaska > > Your reaction to mergemaster is about the same as mine was when I first > encountered it very long ago, and re-discovered when I tried it a > couple years ago. It just seems like more trouble than it's worth, I > can usually figure out what's broken and fix it by hand faster than > messing with all the merge stuff. > Your suggestion to use vipw seems to have worked. Copied the required line, ran /usr/sbin/pwd_mkdb -p /etc/master.passwd and installworld ran without issue. The machine has now rebooted and ntp has set the clock correctly. I don't see ntpd in a ps -aux output. It's unclear what I need to do next, but at least I'm over the first hurdle. I'll go back to your earlier email and attempt the rest of the updates by hand. Thanks for all your help! bob prohaska > But, someone told me that if you give mergemaster the right flags it > can potentially be intervention-free. Those apparently aren't the flag > or two that're suggested at the bottom of UPDATING. So I didn't really > dig into that any deeper, but I toss it out there in case someone can > expand on it. > > It certainly makes some sense that it could be done intervention-free. > When doing other diff-based merges (like 'svn update') you only have to > intervene when there's an actual conflict between some local change > you've made and the incoming changes. > > -- Ian > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" >