From owner-freebsd-stable@FreeBSD.ORG Fri Feb 25 14:07:22 2011 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18DC2106566C for ; Fri, 25 Feb 2011 14:07:22 +0000 (UTC) (envelope-from marco@tolstoy.tols.org) Received: from tolstoy.tols.org (tolstoy.tols.org [IPv6:2a02:898:0:20::57:1]) by mx1.freebsd.org (Postfix) with ESMTP id 852F58FC1D for ; Fri, 25 Feb 2011 14:07:21 +0000 (UTC) Received: from tolstoy.tols.org (localhost [127.0.0.1]) by tolstoy.tols.org (8.14.4/8.14.4) with ESMTP id p1PE7IBU023382 for ; Fri, 25 Feb 2011 14:07:18 GMT (envelope-from marco@tolstoy.tols.org) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.97 at tolstoy.tols.org Received: (from marco@localhost) by tolstoy.tols.org (8.14.4/8.14.4/Submit) id p1PE7Ilr023381 for freebsd-stable@freebsd.org; Fri, 25 Feb 2011 15:07:18 +0100 (CET) (envelope-from marco) Date: Fri, 25 Feb 2011 15:07:18 +0100 From: Marco van Tol To: freebsd-stable@freebsd.org Message-ID: <20110225140718.GC19190@tolstoy.tols.org> Mail-Followup-To: freebsd-stable@freebsd.org References: <4D66CCFF.9020903@buffalo.edu> <86zkpkwff5.fsf@brain.hack.org> <20110225134225.GB19190@tolstoy.tols.org> <20110225134744.GG1379@dev.null.cz> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="EVF5PPMfhYS0aIcm" Content-Disposition: inline In-Reply-To: <20110225134744.GG1379@dev.null.cz> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on tolstoy.tols.org Subject: Re: 8.2/7.4-RELEASEs Announced... X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 14:07:22 -0000 --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 25, 2011 at 02:47:44PM +0100, Marek 'Buki' Kozlovsk=FD wrote: > [snip] > > > I had this problem before and then in my frustration just commented o= ut > > > this line in freebsd-update.conf: > > >=20 > > > #MergeChanges /etc/ /var/named/etc/ /boot/device.hints > > >=20 > > > 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. > > >=20 > > > Any suggestions? > >=20 > > Read up on the mergemaster manual for options "-F" and "-i" :-) >=20 > 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, --=20 Marco van Tol --EVF5PPMfhYS0aIcm Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk1nt5UACgkQbdVEUcCKvoJ1mQCgttbueIfzrY/waq/k3/EEG5Pp rDoAn2YOFB2YdR9ZA2kdAOt0Y+dXPINO =Matp -----END PGP SIGNATURE----- --EVF5PPMfhYS0aIcm--