aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2013-11-28 22:12:48 +0000
committerXin LI <delphij@FreeBSD.org>2013-11-28 22:12:48 +0000
commita462572dbf18e26e9d926b0c3830828036d09a74 (patch)
treeab06208357da8896610fb0edb8014ecb96c2c2da
parent337b0b5de86bb09db3d1bb318a79992d31a59a72 (diff)
downloadsrc-a462572dbf18e26e9d926b0c3830828036d09a74.tar.gz
src-a462572dbf18e26e9d926b0c3830828036d09a74.zip
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
Notes
Notes: svn path=/releng/9.1/; revision=258725
-rw-r--r--UPDATING3
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.sh4
3 files changed, 6 insertions, 3 deletions
diff --git a/UPDATING b/UPDATING
index c1fa3d5cf3d3..caf3c28e86b9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -9,6 +9,9 @@ handbook.
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
+20131128: p9 FreeBSD-EN-13:05.freebsd-update
+ Fix error in patch for FreeBSD-EN-13:04.freebsd-update.
+
20131026: p8 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 cd4f41b9ab2d..b2b9bb563557 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="9.1"
-BRANCH="RELEASE-p8"
+BRANCH="RELEASE-p9"
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