From aa6bb243183258e5c2ce5d7f40c8a6e0afe31a04 Mon Sep 17 00:00:00 2001 From: "P.SCH" Date: Thu, 5 Apr 2012 16:03:21 +0300 Subject: [PATCH 1/5] ZFS Snapshot Alias --- cmd/zfs/zfs_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index b88ab0986634..72e4e1298771 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -131,6 +131,7 @@ typedef enum { HELP_SET, HELP_SHARE, HELP_SNAPSHOT, + HELP_SNAP, HELP_UNMOUNT, HELP_UNSHARE, HELP_ALLOW, @@ -163,6 +164,7 @@ static zfs_command_t command_table[] = { { "destroy", zfs_do_destroy, HELP_DESTROY }, { NULL }, { "snapshot", zfs_do_snapshot, HELP_SNAPSHOT }, + { "snap", zfs_do_snapshot, HELP_SNAP }, { "rollback", zfs_do_rollback, HELP_ROLLBACK }, { "clone", zfs_do_clone, HELP_CLONE }, { "promote", zfs_do_promote, HELP_PROMOTE }, @@ -254,7 +256,10 @@ get_usage(zfs_help_t idx) case HELP_SHARE: return (gettext("\tshare <-a | filesystem>\n")); case HELP_SNAPSHOT: - return (gettext("\tsnapshot [-r] [-o property=value] ... " + return (gettext("\tsnapshot|snap [-r] [-o property=value] ... " + "\n")); + case HELP_SNAP: + return (gettext("\tsnap|snapshot [-r] [-o property=value] ... " "\n")); case HELP_UNMOUNT: return (gettext("\tunmount [-f] " From 58070eeb94d9a27aaa12ba5ef69b13e4a5e591a5 Mon Sep 17 00:00:00 2001 From: "P.SCH" Date: Fri, 6 Apr 2012 11:12:57 +0300 Subject: [PATCH 2/5] Update for the zfs.8 manpage snapshot | snap, unmount | umount, receive | recv --- man/man8/zfs.8 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/man/man8/zfs.8 b/man/man8/zfs.8 index 26dc6cadc122..b4ba26457168 100644 --- a/man/man8/zfs.8 +++ b/man/man8/zfs.8 @@ -37,7 +37,7 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... +\fBzfs\fR \fBsnapshot | snap\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... \fIfilesystem@snapname\fR|\fIvolume@snapname\fR .fi @@ -128,7 +128,7 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB-a\fR | \fIfilesystem\fR|\fImountpoint\fR +\fBzfs\fR \fBunmount | umount\fR [\fB-f\fR] \fB-a\fR | \fIfilesystem\fR|\fImountpoint\fR .fi .LP @@ -148,12 +148,12 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBreceive\fR [\fB-vnFu\fR] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR +\fBzfs\fR \fBreceive | recv\fR [\fB-vnFu\fR] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR .fi .LP .nf -\fBzfs\fR \fBreceive\fR [\fB-vnFu\fR] \fB-d\fR \fIfilesystem\fR +\fBzfs\fR \fBreceive | recv\fR [\fB-vnFu\fR] \fB-d\fR \fIfilesystem\fR .fi .LP From c894dddd3b2eb053c5ad969fd950a6291aec4ecf Mon Sep 17 00:00:00 2001 From: "P.SCH" Date: Fri, 6 Apr 2012 11:22:33 +0300 Subject: [PATCH 3/5] ZFS Snapshot Alias (2) --- cmd/zfs/zfs_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 72e4e1298771..15e224d386cc 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -131,7 +131,6 @@ typedef enum { HELP_SET, HELP_SHARE, HELP_SNAPSHOT, - HELP_SNAP, HELP_UNMOUNT, HELP_UNSHARE, HELP_ALLOW, @@ -164,7 +163,6 @@ static zfs_command_t command_table[] = { { "destroy", zfs_do_destroy, HELP_DESTROY }, { NULL }, { "snapshot", zfs_do_snapshot, HELP_SNAPSHOT }, - { "snap", zfs_do_snapshot, HELP_SNAP }, { "rollback", zfs_do_rollback, HELP_ROLLBACK }, { "clone", zfs_do_clone, HELP_CLONE }, { "promote", zfs_do_promote, HELP_PROMOTE }, @@ -258,9 +256,6 @@ get_usage(zfs_help_t idx) case HELP_SNAPSHOT: return (gettext("\tsnapshot|snap [-r] [-o property=value] ... " "\n")); - case HELP_SNAP: - return (gettext("\tsnap|snapshot [-r] [-o property=value] ... " - "\n")); case HELP_UNMOUNT: return (gettext("\tunmount [-f] " "<-a | filesystem|mountpoint>\n")); @@ -6166,6 +6161,12 @@ main(int argc, char **argv) if (strcmp(cmdname, "recv") == 0) cmdname = "receive"; + /* + * The 'snap' command is an alias for 'snapshot' + */ + if (strcmp(cmdname, "snap") == 0) + cmdname = "snapshot"; + /* * Special case '-?' */ From e8d3c2be3d9a171bd73fb25016b3b37555ae38d0 Mon Sep 17 00:00:00 2001 From: "P.SCH" Date: Mon, 9 Apr 2012 09:05:54 +0300 Subject: [PATCH 4/5] Update for zfs list property snapshot|snap --- man/man8/zfs.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/man8/zfs.8 b/man/man8/zfs.8 index b4ba26457168..558e2404ddbe 100644 --- a/man/man8/zfs.8 +++ b/man/man8/zfs.8 @@ -75,7 +75,7 @@ zfs \- configures ZFS file systems .LP .nf \fBzfs\fR \fBlist\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-H\fR][\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]] - [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ... + [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR|\fIsnap\fR] ... .fi .LP @@ -1467,7 +1467,7 @@ Recursively rename the snapshots of all descendent datasets. Snapshots are the o .ne 2 .mk .na -\fB\fBzfs\fR \fBlist\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR] [\fB-H\fR] [\fB-o\fR \fIproperty\fR[,\fI\&...\fR]] [ \fB-t\fR \fItype\fR[,\fI\&...\fR]] [ \fB-s\fR \fIproperty\fR ] ... [ \fB-S\fR \fIproperty\fR ] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...\fR +\fB\fBzfs\fR \fBlist\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR] [\fB-H\fR] [\fB-o\fR \fIproperty\fR[,\fI\&...\fR]] [ \fB-t\fR \fItype\fR[,\fI\&...\fR]] [ \fB-s\fR \fIproperty\fR ] ... [ \fB-S\fR \fIproperty\fR ] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR|\fIsnap\fR] ...\fR .ad .sp .6 .RS 4n From 772edd0103f6f517cf18b01c7cd6534a76262d44 Mon Sep 17 00:00:00 2001 From: "P.SCH" Date: Mon, 9 Apr 2012 09:12:46 +0300 Subject: [PATCH 5/5] Zfs cmd update for zfs list -t snap --- cmd/zfs/zfs_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 15e224d386cc..5bcd6d6a526b 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -229,7 +229,7 @@ get_usage(zfs_help_t idx) return (gettext("\tlist [-rH][-d max] " "[-o property[,...]] [-t type[,...]] [-s property] ...\n" "\t [-S property] ... " - "[filesystem|volume|snapshot] ...\n")); + "[filesystem|volume|snapshot|snap] ...\n")); case HELP_MOUNT: return (gettext("\tmount\n" "\tmount [-vO] [-o opts] <-a | filesystem>\n")); @@ -2766,7 +2766,7 @@ zfs_do_list(int argc, char **argv) flags &= ~ZFS_ITER_PROP_LISTSNAPS; while (*optarg != '\0') { static char *type_subopts[] = { "filesystem", - "volume", "snapshot", "all", NULL }; + "volume", "snapshot", "snap","all", NULL }; switch (getsubopt(&optarg, type_subopts, &value)) { @@ -2777,9 +2777,10 @@ 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_DATASET; break;