Skip to content

Commit 0981c67

Browse files
authored
Merge pull request #310 from truenas/fix-create-clone-exit-code-hm
NAS-137845 / 26.04 / Make mount/share errors non-fatal for zfs create/clone
2 parents 63e8019 + 634e05a commit 0981c67

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

cmd/zfs/zfs_main.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,11 @@ zfs_do_clone(int argc, char **argv)
914914
log_history = B_FALSE;
915915
}
916916

917-
ret = zfs_mount_and_share(g_zfs, argv[1], ZFS_TYPE_DATASET);
917+
/*
918+
* Dataset cloned successfully, mount/share failures are
919+
* non-fatal.
920+
*/
921+
(void) zfs_mount_and_share(g_zfs, argv[1], ZFS_TYPE_DATASET);
918922
}
919923

920924
zfs_close(zhp);
@@ -1319,7 +1323,9 @@ zfs_do_create(int argc, char **argv)
13191323
goto error;
13201324
}
13211325

1322-
ret = zfs_mount_and_share(g_zfs, argv[0], ZFS_TYPE_DATASET);
1326+
/* Dataset created successfully, mount/share failures are non-fatal */
1327+
ret = 0;
1328+
(void) zfs_mount_and_share(g_zfs, argv[0], ZFS_TYPE_DATASET);
13231329
error:
13241330
nvlist_free(props);
13251331
return (ret);

0 commit comments

Comments
 (0)