MFC r257879:

Fix typo in r256646: We want to generate lists of directories in
INDEX-OLD and INDEX-NEW and compare them, not generate the same
list of directories from INDEX-OLD twice...

Pointy hats to: cperciva & everybody who didn't proofread
		EN-13:04 enough
Errata Notice:	FreeBSD-EN-13:05.freebsd-update
Approved by:	so

3 files changed, 6 insertions, 3 deletions

diff --git a/UPDATING b/UPDATING
index 14f01addbde9..16b40d37400a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -11,6 +11,9 @@ handbook:
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
+20131128:	p2	FreeBSD-EN-13:05.freebsd-update
+	Fix error in patch for FreeBSD-EN-13:04.freebsd-update.
+
 20131026:	p1	FreeBSD-EN-13:04.freebsd-update
 	Fix multiple freebsd-update bugs that break upgrading to
 	FreeBSD 10.0.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 0202971a04ca..d047e673fae8 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="9.2"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index e41bac59192d..206988cf7377 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -2884,8 +2884,8 @@ again to finish installing updates.
 	install_delete INDEX-OLD INDEX-NEW || return 1
 
 	# Remove old directories
-	grep -vE '^/boot/' $1/INDEX-OLD |
-	    grep -E '^[^|]+\|d\|' > INDEX-OLD
+	grep -vE '^/boot/' $1/INDEX-NEW |
+	    grep -E '^[^|]+\|d\|' > INDEX-NEW
 	grep -vE '^/boot/' $1/INDEX-OLD |
 	    grep -E '^[^|]+\|d\|' > INDEX-OLD
 	install_delete INDEX-OLD INDEX-NEW || return 1