changeset 4015:9a00a50342cd

6544983 fix to 6542677 is too broad, prevents bfu to non-zfs-boot releases
author lalt
date Thu, 12 Apr 2007 07:52:19 -0700
parents 360fee62f0eb
children 6bbba7fb458e
files usr/src/tools/scripts/bfu.sh
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/tools/scripts/bfu.sh	Wed Apr 11 19:57:44 2007 -0700
+++ b/usr/src/tools/scripts/bfu.sh	Thu Apr 12 07:52:19 2007 -0700
@@ -2120,10 +2120,13 @@
 	done
 fi
 
-if grep '^[ 	]*zfsroot:' $root/etc/system >/dev/null ; then
+if grep '^[ 	]*zfsroot:' $root/etc/system >/dev/null && \
+	    archive_file_exists i86pc.boot boot/grub/zfs_stage1_5; then
 	echo "Cannot BFU a system with the mountroot version"\
 		"of zfs boot support."
-	echo "See http://www.opensolaris.org/os/community/on/flag-days/pages/2007032801"
+	echo "For information on how to transition this system to the new"
+	echo "zfs boot support, see:"
+	echo "http://www.opensolaris.org/os/community/zfs/boot/zfsboot-manual/mntroot-transition/"
 	fail ""
 fi