From owner-freebsd-questions@freebsd.org Tue Aug 4 21:51:30 2015 Return-Path: Delivered-To: freebsd-questions@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 477CE9B36FF for ; Tue, 4 Aug 2015 21:51:30 +0000 (UTC) (envelope-from doug@fledge.watson.org) Received: from cyrus.watson.org (cyrus.watson.org [198.74.231.69]) by mx1.freebsd.org (Postfix) with ESMTP id 23D681F8F for ; Tue, 4 Aug 2015 21:51:30 +0000 (UTC) (envelope-from doug@fledge.watson.org) Received: from fledge.watson.org (fledge.watson.org [198.74.231.63]) by cyrus.watson.org (Postfix) with ESMTPS id 3808B46B59 for ; Tue, 4 Aug 2015 17:51:29 -0400 (EDT) Received: from fledge.watson.org (doug@localhost.watson.org [127.0.0.1]) by fledge.watson.org (8.15.2/8.15.2) with ESMTP id t74LpSdR004430 for ; Tue, 4 Aug 2015 17:51:28 -0400 (EDT) (envelope-from doug@fledge.watson.org) Received: from localhost (doug@localhost) by fledge.watson.org (8.15.2/8.15.2/Submit) with ESMTP id t74LpSWS004427 for ; Tue, 4 Aug 2015 17:51:28 -0400 (EDT) (envelope-from doug@fledge.watson.org) Date: Tue, 4 Aug 2015 17:51:28 -0400 (EDT) From: doug Reply-To: doug@safeport.com To: freebsd-questions@FreeBSD.org Subject: freebsd-update 9.1 --> 9.3 Message-ID: User-Agent: Alpine 2.20 (BSF 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (fledge.watson.org [127.0.0.1]); Tue, 04 Aug 2015 22:51:29 +0100 (BST) X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Aug 2015 21:51:30 -0000 First this is on a test system so no harm [or not], no foul. I started with an ISO for 9.1, added the security changes and then tried to update 9.1 --> 9.2. I was given a non-ending series of files in /etc (with no local changes) to merge. I did half-a-dozen or before stopping the process and doing a rollback. I have two questions: (1) uname -a shows: FreeBSD chaos.boltsys.com 9.2-RELEASE-p15 FreeBSD 9.2-RELEASE-p15 #0: Mon Nov 3 20:31:29 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 while 336 of 354 file show releng/9.1 and none have 9.2. So is it 9.1 with a false indicator or is it messed up? The system is running the GENERIC kernel. (2) Section 24.2.1. The Configuration File - from the handbook says "... The file merge process is a series of diff(1) patches similar to mergemaster(8), but with fewer options. Merges are either accepted, open an editor, or cause freebsd-update to abort. When in doubt, backup /etc and just accept the merges." How is this done with freebsd-update? The format of the files presented must be changed. I have questions archived back to 1/1/13 and with google I was only able to get a couple of broken links. So I would really appreciate any pointers even if its, "you can't get there from here". Thanks