summaryrefslogtreecommitdiff
path: root/usr/src/psm/stand/cpr/common/support.c
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/cpr/common/support.c
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/cpr/common/support.c')
-rw-r--r--usr/src/psm/stand/cpr/common/support.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/psm/stand/cpr/common/support.c b/usr/src/psm/stand/cpr/common/support.c
index dfafa98865..d3cc145ea4 100644
--- a/usr/src/psm/stand/cpr/common/support.c
+++ b/usr/src/psm/stand/cpr/common/support.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -37,7 +37,6 @@ extern void prom_unmap(caddr_t, uint_t);
extern int cpr_debug;
static int cpr_show_props = 0;
-
/*
* Read the config file and pass back the file path, filesystem
* device path.
@@ -53,7 +52,8 @@ cpr_read_cprinfo(int fd, char *file_path, char *fs_path)
(void) prom_strcpy(file_path, cf.cf_path);
(void) prom_strcpy(fs_path, cf.cf_dev_prom);
-
+ if (cf.cf_type == CFT_ZVOL)
+ volname = cf.cf_fs;
return (0);
}