From owner-freebsd-stable@FreeBSD.ORG Fri Feb 25 13:47:51 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 8627A106566B for ; Fri, 25 Feb 2011 13:47:51 +0000 (UTC) (envelope-from buki@dev.null.cz) Received: from dev.null.cz (dev.null.cz [IPv6:2a01:430:34:0:2:0:dead:babe]) by mx1.freebsd.org (Postfix) with ESMTP id 0D16B8FC19 for ; Fri, 25 Feb 2011 13:47:50 +0000 (UTC) Received: from dev.null.cz (localhost [127.0.0.1]) by dev.null.cz (8.14.4/8.14.4) with ESMTP id p1PDliD0084770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 25 Feb 2011 14:47:49 +0100 (CET) (envelope-from buki@dev.null.cz) Received: (from buki@localhost) by dev.null.cz (8.14.4/8.14.4/Submit) id p1PDlikb084769 for freebsd-stable@freebsd.org; Fri, 25 Feb 2011 14:47:44 +0100 (CET) (envelope-from buki) Date: Fri, 25 Feb 2011 14:47:44 +0100 From: "Marek 'Buki' =?utf-8?Q?Kozlovsk=C3=BD?=" To: freebsd-stable@freebsd.org Message-ID: <20110225134744.GG1379@dev.null.cz> References: <4D66CCFF.9020903@buffalo.edu> <86zkpkwff5.fsf@brain.hack.org> <20110225134225.GB19190@tolstoy.tols.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5G06lTa6Jq83wMTw" Content-Disposition: inline In-Reply-To: <20110225134225.GB19190@tolstoy.tols.org> User-Agent: Mutt/1.5.21 (2010-09-15) 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 dev.null.cz 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 13:47:51 -0000 --5G06lTa6Jq83wMTw Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable [snip] > > I had this problem before and then in my frustration just commented out > > 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" :-) perhaps you mean "-Ui" ? problem is, he might have no src tree when using freebsd-update, so mergemaster is a no-go :( > Marco >=20 Buki --5G06lTa6Jq83wMTw Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (FreeBSD) iEYEARECAAYFAk1nswAACgkQPzhIkpLLm0+ogQCgtEN85pTwaaOMntKqi4fpwhAo eN4An0NRk7+cPa0vUz5KAmnUHOBqjUCp =edL7 -----END PGP SIGNATURE----- --5G06lTa6Jq83wMTw--