summaryrefslogtreecommitdiff
path: root/usr/src/common/zfs
diff options
context:
space:
mode:
authoreschrock <none@none>2007-10-29 14:37:26 -0700
committereschrock <none@none>2007-10-29 14:37:26 -0700
commit2f8aaab38e6371ad39ed90a1211ba8921acbb4d5 (patch)
tree38104de7eb52218c362a9f254d62e8b756bc21de /usr/src/common/zfs
parent18bdb8a7484e018149ac9a2766c97bdea9752c87 (diff)
downloadillumos-gate-2f8aaab38e6371ad39ed90a1211ba8921acbb4d5.tar.gz
PSARC 2007/607 ZFS cachefile property
6620436 zpool import can dump core with multiple '-o' arguments 6620452 zfs should support placing pool configuration in alternate cachefiles
Diffstat (limited to 'usr/src/common/zfs')
-rw-r--r--usr/src/common/zfs/zpool_prop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/common/zfs/zpool_prop.c b/usr/src/common/zfs/zpool_prop.c
index 8ca7b919bc..831ef14f2c 100644
--- a/usr/src/common/zfs/zpool_prop.c
+++ b/usr/src/common/zfs/zpool_prop.c
@@ -70,6 +70,8 @@ zpool_prop_init(void)
ZFS_TYPE_POOL, "<path>", "ALTROOT");
register_string(ZPOOL_PROP_BOOTFS, "bootfs", NULL, PROP_DEFAULT,
ZFS_TYPE_POOL, "<filesystem>", "BOOTFS");
+ register_string(ZPOOL_PROP_CACHEFILE, "cachefile", NULL, PROP_DEFAULT,
+ ZFS_TYPE_POOL, "<file>", "CACHEFILE");
/* readonly number properties */
register_number(ZPOOL_PROP_SIZE, "size", 0, PROP_READONLY,
@@ -94,8 +96,6 @@ zpool_prop_init(void)
ZFS_TYPE_POOL, "on | off", "DELEGATION", boolean_table);
register_index(ZPOOL_PROP_AUTOREPLACE, "autoreplace", 0, PROP_DEFAULT,
ZFS_TYPE_POOL, "on | off", "REPLACE", boolean_table);
- register_index(ZPOOL_PROP_TEMPORARY, "temporary", 0, PROP_DEFAULT,
- ZFS_TYPE_POOL, "on | off", "TEMP", boolean_table);
/* default index properties */
register_index(ZPOOL_PROP_FAILUREMODE, "failmode",