diff options
| author | lalt <none@none> | 2007-04-12 07:52:19 -0700 |
|---|---|---|
| committer | lalt <none@none> | 2007-04-12 07:52:19 -0700 |
| commit | 2278e7fc4650f16255db08e12d694bd293cc26d6 (patch) | |
| tree | 8e4a8190e4ae0ba6efd689d4b9c1dbd8e8d09534 /usr/src | |
| parent | a022fe3e0bc959fae460b8b5b818cd1265bf4c66 (diff) | |
| download | illumos-joyent-2278e7fc4650f16255db08e12d694bd293cc26d6.tar.gz | |
6544983 fix to 6542677 is too broad, prevents bfu to non-zfs-boot releases
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/tools/scripts/bfu.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh index 241b29b486..9657dafc87 100644 --- a/usr/src/tools/scripts/bfu.sh +++ b/usr/src/tools/scripts/bfu.sh @@ -2120,10 +2120,13 @@ else 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 |