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
commita57976ab1274f11075cb35020a7729c9a675bb44 (patch)
tree3f285d6ce6cd5041cf7c255362c51188dba5f56a
parentf90bf372e7310ab1d65419edb107387236d3e5c0 (diff)
downloadsrc-a57976ab1274f11075cb35020a7729c9a675bb44.tar.gz
src-a57976ab1274f11075cb35020a7729c9a675bb44.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/8.3/; 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 6230b9bfa493..d9ad537232ee 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: p13 FreeBSD-EN-13:05.freebsd-update
+ Fix error in patch for FreeBSD-EN-13:04.freebsd-update.
+
20131026: p12 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 4093430d25af..308afc876486 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="8.3"
-BRANCH="RELEASE-p12"
+BRANCH="RELEASE-p13"
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