From owner-svn-src-all@FreeBSD.ORG  Mon Dec 20 15:17:34 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8ED951065673;
	Mon, 20 Dec 2010 15:17:34 +0000 (UTC)
	(envelope-from netchild@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D4CB8FC18;
	Mon, 20 Dec 2010 15:17:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBKFHYcQ061625;
	Mon, 20 Dec 2010 15:17:34 GMT
	(envelope-from netchild@svn.freebsd.org)
Received: (from netchild@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBKFHYa6061623;
	Mon, 20 Dec 2010 15:17:34 GMT
	(envelope-from netchild@svn.freebsd.org)
Message-Id: <201012201517.oBKFHYa6061623@svn.freebsd.org>
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Mon, 20 Dec 2010 15:17:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216591 - head
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Dec 2010 15:17:34 -0000

Author: netchild
Date: Mon Dec 20 15:17:34 2010
New Revision: 216591
URL: http://svn.freebsd.org/changeset/base/216591

Log:
  Suggest to run the delete-old target after the second mergemaster. If you run
  it before, your rc scripts may still reference old files/directories and
  if you are in the unlucky situation to have triggered a reboot (intentionally
  or not) between the delete-old run and the mergemaster, your system may not
  start anymore.
  
  While I'm here, give a hint about delete-old-libs.
  
  Noticed by:	bcr (luckily in a discussion and not by getting hit by this)
  MFC after:	1 week

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Dec 20 14:54:24 2010	(r216590)
+++ head/UPDATING	Mon Dec 20 15:17:34 2010	(r216591)
@@ -1136,8 +1136,8 @@ COMMON ITEMS:
 	<reboot in single user>				[3]
 	mergemaster -p					[5]
 	make installworld
-	make delete-old
 	mergemaster -i					[4]
+	make delete-old					[6]
 	<reboot>
 
 
@@ -1174,8 +1174,8 @@ COMMON ITEMS:
 	<reboot in single user>				[3]
 	mergemaster -p					[5]
 	make installworld
-	make delete-old
 	mergemaster -i					[4]
+	make delete-old					[6]
 	<reboot>
 
 	Make sure that you've read the UPDATING file to understand the
@@ -1218,6 +1218,10 @@ COMMON ITEMS:
 	install) after the buildworld before this step if you last updated
 	from current before 20020224 or from -stable before 20020408.
 
+	[6] This only deletes old files and directories. Old libraries
+	can be deleted by "make delete-old-libs", but you have to make
+	sure that no program is using those libraries anymore.
+
 	[8] In order to have a kernel that can run the 4.x binaries needed to
 	do an installworld, you must include the COMPAT_FREEBSD4 option in
 	your kernel.  Failure to do so may leave you with a system that is