Date: Fri, 25 Feb 2011 15:07:18 +0100 From: Marco van Tol <marco@tols.org> To: freebsd-stable@freebsd.org Subject: Re: 8.2/7.4-RELEASEs Announced... Message-ID: <20110225140718.GC19190@tolstoy.tols.org> In-Reply-To: <20110225134744.GG1379@dev.null.cz> References: <4D66CCFF.9020903@buffalo.edu> <86zkpkwff5.fsf@brain.hack.org> <20110225134225.GB19190@tolstoy.tols.org> <20110225134744.GG1379@dev.null.cz>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Fri, Feb 25, 2011 at 02:47:44PM +0100, Marek 'Buki' Kozlovský wrote: > [snip] > > > I had this problem before and then in my frustration just commented out > > > this line in freebsd-update.conf: > > > > > > #MergeChanges /etc/ /var/named/etc/ /boot/device.hints > > > > > > I got lucky that time, but is this really safe? What if, say, a new > > > daemon has been installed in the upgrade and needs a new user. > > > > > > Any suggestions? > > > > Read up on the mergemaster manual for options "-F" and "-i" :-) > > perhaps you mean "-Ui" ? > problem is, he might have no src tree when using freebsd-update, so > mergemaster is a no-go :( My apologies. I went ahead to fast and replied with source-upgrade in mind. Sorry, -- Marco van Tol [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk1nt5UACgkQbdVEUcCKvoJ1mQCgttbueIfzrY/waq/k3/EEG5Pp rDoAn2YOFB2YdR9ZA2kdAOt0Y+dXPINO =Matp -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110225140718.GC19190>