summaryrefslogtreecommitdiff
path: root/usr/src/psm/stand/bootblks/common/util.fth
diff options
context:
space:
mode:
authorgw25295 <none@none>2008-04-11 18:36:28 -0700
committergw25295 <none@none>2008-04-11 18:36:28 -0700
commite7cbe64f7a72dae5cb44f100db60ca88f3313c65 (patch)
tree778467a6522111f338e4644cc2cb895dcecacee4 /usr/src/psm/stand/bootblks/common/util.fth
parentf635d46a9872dc5a02bbbd736f2bf18685c2c221 (diff)
downloadillumos-joyent-e7cbe64f7a72dae5cb44f100db60ca88f3313c65.tar.gz
PSARC 2006/370 ZFS Boot Support
5008936 ZFS and/or zvol should support dumps 5070124 dumpadm -d /dev/... does not enforce block device requirement for savecore 6521468 ZFS Boot support Phase 2 6553503 bfu can't find 'rootdev' from /etc/vfstab on a zfs root filesystem 6574993 zfs_mountroot() may need to call clkset() to set the boot_time kstat 6633197 zvol should not permit newfs or createpool while it's in use by swap or dump 6661127 zfs_name_valid() does not support ZFS_TYPE_POOL 6684121 The changes to smf scripts for supporting canmount=noauto will cause a boot failure. --HG-- rename : usr/src/psm/stand/bootblks/zfs/common/debug-zfs.fth => deleted_files/usr/src/psm/stand/bootblks/zfs/common/debug-zfs.fth rename : usr/src/psm/stand/bootblks/zfs/common/big-zfs.fth => usr/src/psm/stand/bootblks/zfs/common/fs-zfs.fth
Diffstat (limited to 'usr/src/psm/stand/bootblks/common/util.fth')
-rw-r--r--usr/src/psm/stand/bootblks/common/util.fth14
1 files changed, 9 insertions, 5 deletions
diff --git a/usr/src/psm/stand/bootblks/common/util.fth b/usr/src/psm/stand/bootblks/common/util.fth
index d48904646c..3bbcd62499 100644
--- a/usr/src/psm/stand/bootblks/common/util.fth
+++ b/usr/src/psm/stand/bootblks/common/util.fth
@@ -20,7 +20,7 @@
\
\
\ ident "%Z%%M% %I% %E% SMI"
-\ Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+\ Copyright 2008 Sun Microsystems, Inc. All rights reserved.
\ Use is subject to license terms.
\
@@ -74,11 +74,15 @@ d# 256 constant /buf-len
swap 1+ swap 1-
;
+: die ( str -- )
+ cr type cr abort
+;
+
: diag-cr? ( -- ) diagnostic-mode? if cr then ;
: find-abort ( name$ -- )
- ." Can't find " type abort
+ cr ." Can't find " type cr abort
;
: get-package ( pkg$ -- ph )
@@ -192,7 +196,7 @@ d# 256 constant /rd-fcode
d# 8192 /rd-fcode - constant rd-offset
: open-abort ( file$ -- )
- ." Can't open " type abort
+ cr ." Can't open " type cr abort
;
/buf-len buffer: open-cstr
@@ -210,10 +214,10 @@ d# 8192 /rd-fcode - constant rd-offset
: read-disk ( adr len off ih -- )
dup >r 0 swap cif-seek if ( adr len r: ih )
- ." seek failed" abort
+ " seek failed" die
then
tuck swap r> cif-read <> if ( )
- ." read failed" abort
+ " read failed" die
then
;