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 fe8b57ae7872..1e3262bcd5ba 100644
--- a/UPDATING
+++ b/UPDATING
@@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V:
 	debugging tools present in HEAD were left in place because
 	sun4v support still needs work to become production ready.
 
+20131128:	p6	FreeBSD-EN-13:05.freebsd-update
+	Fix error in patch for FreeBSD-EN-13:04.freebsd-update.
+
 20131026:	p5	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 b0221841880e..1f076da08de9 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="8.4"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
 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 1590413096d6..b2eb161a03a9 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -2835,8 +2835,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