Author: delphij
Date: Fri Mar 28 22:44:01 2014
New Revision: 263886
URL: http://svnweb.freebsd.org/changeset/base/263886
Log:
4573 ZFS snapshot alias
illumos/illumos-gate at 7dbbcd8300f0241d3ec9686f2a0a06107c1b90cb
Modified:
vendor/illumos/dist/cmd/zfs/zfs_main.c
Modified: vendor/illumos/dist/cmd/zfs/zfs_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zfs/zfs_main.c Fri Mar 28 22:04:27 2014 (r263885)
+++ vendor/illumos/dist/cmd/zfs/zfs_main.c Fri Mar 28 22:44:01 2014 (r263886)
@@ -3052,7 +3052,7 @@ zfs_do_list(int argc, char **argv)
flags &= ~ZFS_ITER_PROP_LISTSNAPS;
while (*optarg != '\0') {
static char *type_subopts[] = { "filesystem",
- "volume", "snapshot", "bookmark",
+ "volume", "snapshot", "snap", "bookmark",
"all", NULL };
switch (getsubopt(&optarg, type_subopts,
@@ -3064,12 +3064,13 @@ zfs_do_list(int argc, char **argv)
types |= ZFS_TYPE_VOLUME;
break;
case 2:
+ case 3:
types |= ZFS_TYPE_SNAPSHOT;
break;
- case 3:
+ case 4:
types |= ZFS_TYPE_BOOKMARK;
break;
- case 4:
+ case 5:
types = ZFS_TYPE_DATASET |
ZFS_TYPE_BOOKMARK;
break;
@@ -6775,6 +6776,12 @@ main(int argc, char **argv)
cmdname = "receive";
/*
+ * The 'snap' command is an alias for 'snapshot'
+ */
+ if (strcmp(cmdname, "snap") == 0)
+ cmdname = "snapshot";
+
+ /*
* Special case '-?'
*/
if (strcmp(cmdname, "-?") == 0)