diff options
| author | nn35248 <none@none> | 2006-09-15 11:26:15 -0700 |
|---|---|---|
| committer | nn35248 <none@none> | 2006-09-15 11:26:15 -0700 |
| commit | 5f8e16172ef40e14cf931b329fedb86ea369a42c (patch) | |
| tree | 37ab126c5ff7e80782d98f56f3d1921a51ed791d /usr/src/cmd/zoneadm/zfs.c | |
| parent | efb80947b01107dafbbf0157de0d7e1af6551259 (diff) | |
| download | illumos-gate-5f8e16172ef40e14cf931b329fedb86ea369a42c.tar.gz | |
6468554 zone install with a zfs zonepath could not create a dataset
6469902 BrandZ and GCC don't get along
6470348 Makefile race condition in usr/lib/brand/lx
6470764 zfs_clone() confuses filesystems and volumes
Diffstat (limited to 'usr/src/cmd/zoneadm/zfs.c')
| -rw-r--r-- | usr/src/cmd/zoneadm/zfs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/usr/src/cmd/zoneadm/zfs.c b/usr/src/cmd/zoneadm/zfs.c index dfb17534a9..24569614c1 100644 --- a/usr/src/cmd/zoneadm/zfs.c +++ b/usr/src/cmd/zoneadm/zfs.c @@ -415,9 +415,10 @@ clone_snap(char *snapshot_name, char *zonepath) (void) printf(gettext("Cloning snapshot %s\n"), snapshot_name); if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0 || - nvlist_add_boolean_value(props, - zfs_prop_to_name(ZFS_PROP_SHARENFS), B_FALSE) != 0) { - nvlist_free(props); + nvlist_add_string(props, zfs_prop_to_name(ZFS_PROP_SHARENFS), + "off") != 0) { + if (props != NULL) + nvlist_free(props); (void) fprintf(stderr, gettext("could not create ZFS clone " "%s: out of memory\n"), zonepath); return (Z_ERR); @@ -710,9 +711,10 @@ create_zfs_zonepath(char *zonepath) return; if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0 || - nvlist_add_boolean_value(props, zfs_prop_to_name(ZFS_PROP_SHARENFS), - B_FALSE) != 0) { - nvlist_free(props); + nvlist_add_string(props, zfs_prop_to_name(ZFS_PROP_SHARENFS), + "off") != 0) { + if (props != NULL) + nvlist_free(props); (void) fprintf(stderr, gettext("cannot create ZFS dataset %s: " "out of memory\n"), zfs_name); } |