From owner-freebsd-current@FreeBSD.ORG Fri Oct 28 11:56:32 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1B651065675 for ; Fri, 28 Oct 2011 11:56:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id A7CDC8FC14 for ; Fri, 28 Oct 2011 11:56:32 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 19E6446B1A; Fri, 28 Oct 2011 07:56:25 -0400 (EDT) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id AFF458A02F; Fri, 28 Oct 2011 07:56:24 -0400 (EDT) From: John Baldwin To: freebsd-current@freebsd.org Date: Fri, 28 Oct 2011 07:47:25 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p8; KDE/4.5.5; amd64; ; ) References: <20111027102208.88BFB106564A@hub.freebsd.org> <20111028084329.134A0106566C@hub.freebsd.org> In-Reply-To: <20111028084329.134A0106566C@hub.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201110280747.25746.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Fri, 28 Oct 2011 07:56:24 -0400 (EDT) Cc: Thomas Mueller Subject: Re: Upgrade from source to RC1: problems with /etc : lost users and dbus X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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, 28 Oct 2011 11:56:32 -0000 On Friday, October 28, 2011 4:43:28 am Thomas Mueller wrote: > from Tom Evans : > > I have had this happen before, the PEBKAC. When running mergemaster, > > it will prompt you to install new passwd, master.passwd and group > > files - if you have added local users you must not say yes to this, > > you must either merge the changes in or keep your local one. > > > If you still have a backup, you are probably missing just master.passwd. > > > hald, dbus would fail to start since their users are no longer there. > > > Once you've done this to your system once, you never want to do it again! > > When I had this problem, I was itching to get to bed. But since then, I checked /etc and the backup, and found master.passwd, copied it back, still have to boot into RC1 to see if the fix works. > > How does one run mergemaster without running roughshod over existing configuration? > > I did hit d (delete) on some files I didn't want to trash, such as mail.rc and the ports directory configuration. > > I wish there were a way to do a practice run with mergemaster without destroying anything, just as a medical student may practice on human cadavers, or flying in a flight simulator, where the consequences of doing the wrong thing are not disastrous. That way, I'd know what to do for next time. > > I could make one backup at the beginning, before the first mergemaster -p, and then another after that, before the second mergemaster. > > I remember etcupdate from NetBSD, see it in FreeBSD ports/sysutils, but not in FreeBSD base system. Hmm, I did not know NetBSD had a util called etcupdate. However, the etcupdate in ports will work fine for FreeBSD. You do need to bootstrap it (see the notes in the manpage) once before you do a cvsup or svn up, but after that it should do 3-way merges to files rather easily. You can also see your local customizations via 'etcupdate diff'. -- John Baldwin