Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZFS list snapshot property alias 

Add support for the `zfs list -t snap` alias which is available under
Oracle Solaris 11.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #640
This commit is contained in:
P.SCH 2012-04-09 09:05:54 +03:00 committed by Brian Behlendorf
parent 10b75496bb
commit cf81b00a73
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/zfs/zfs_main.c
View File

@ -229,7 +229,7 @@ get_usage(zfs_help_t idx)
return (gettext("\tlist [-rH][-d max] " return (gettext("\tlist [-rH][-d max] "
"[-o property[,...]] [-t type[,...]] [-s property] ...\n" "[-o property[,...]] [-t type[,...]] [-s property] ...\n"
"\t [-S property] ... " "\t [-S property] ... "
"[filesystem|volume|snapshot] ...\n")); "[filesystem|volume|snapshot|snap] ...\n"));
case HELP_MOUNT: case HELP_MOUNT:
return (gettext("\tmount\n" return (gettext("\tmount\n"
"\tmount [-vO] [-o opts] <-a | filesystem>\n")); "\tmount [-vO] [-o opts] <-a | filesystem>\n"));
@ -2766,7 +2766,7 @@ zfs_do_list(int argc, char **argv)
flags &= ~ZFS_ITER_PROP_LISTSNAPS; flags &= ~ZFS_ITER_PROP_LISTSNAPS;
while (*optarg != '\0') { while (*optarg != '\0') {
static char *type_subopts[] = { "filesystem", static char *type_subopts[] = { "filesystem",
"volume", "snapshot", "all", NULL }; "volume", "snapshot", "snap", "all", NULL };
switch (getsubopt(&optarg, type_subopts, switch (getsubopt(&optarg, type_subopts,
&value)) { &value)) {
@ -2777,9 +2777,10 @@ zfs_do_list(int argc, char **argv)
types |= ZFS_TYPE_VOLUME; types |= ZFS_TYPE_VOLUME;
break; break;
case 2: case 2:
case 3:
types |= ZFS_TYPE_SNAPSHOT; types |= ZFS_TYPE_SNAPSHOT;
break; break;
case 3: case 4:
types = ZFS_TYPE_DATASET; types = ZFS_TYPE_DATASET;
break; break;

4
man/man8/zfs.8
View File

@ -75,7 +75,7 @@ zfs \- configures ZFS file systems
.LP .LP
.nf .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[,...]] \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 .fi
.LP .LP
@ -1471,7 +1471,7 @@ Recursively rename the snapshots of all descendent datasets. Snapshots are the o
.ne 2 .ne 2
.mk .mk
.na .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 .ad
.sp .6 .sp .6
.RS 4n .RS 4n