diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2012-07-08 17:54:01 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2012-07-08 17:54:01 +0000 |
| commit | b2722856e2cbc8bde176f1e5883a331a5d666cfd (patch) | |
| tree | 784e15d3efbf095beb59c2f67b3305c6b769271e /Completion/Unix/Command | |
| parent | e1491b2542dd78926adf96b203a26366bdb1a576 (diff) | |
| download | zsh-b2722856e2cbc8bde176f1e5883a331a5d666cfd.tar.gz zsh-b2722856e2cbc8bde176f1e5883a331a5d666cfd.tar.xz zsh-b2722856e2cbc8bde176f1e5883a331a5d666cfd.zip | |
Danek: 30562: Solaris completion updates
Diffstat (limited to 'Completion/Unix/Command')
| -rw-r--r-- | Completion/Unix/Command/_zfs | 27 | ||||
| -rw-r--r-- | Completion/Unix/Command/_zpool | 3 |
2 files changed, 13 insertions, 17 deletions
diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs index 204784d56..4cc24a59f 100644 --- a/Completion/Unix/Command/_zfs +++ b/Completion/Unix/Command/_zfs @@ -1,5 +1,5 @@ #compdef zfs -# Synced with the S11U1 build 16 man page +# Synced with the S11U1 build 20 man page _zfs() { local context state line expl @@ -21,7 +21,7 @@ _zfs() { "compressratio" "mounted" "origin" "usedbychildren" "usedbydataset" "usedbyrefreservation" "usedbysnapshots" "defer_destroy" "userused@" "userrefs" "groupused@" - "keystatus" "rekeydate" + "keychangedate" "keystatus" "rekeydate" ) # TODO: Be cleverer about what values can be set. Is there any way to @@ -111,12 +111,12 @@ _zfs() { '-p[Create parent datasets]' \ '-o[Set initial properties]:property:_values -s , "property" $create_properties' \ - set1 \ - ':filesystem:' \ + ':filesystem:_zfs_dataset -t fs -e "parent dataset"' \ - set2 \ '-s[Create sparse volume]' \ '-b[Set volblocksize]:blocksize:' \ '-V[Set size]:size:' \ - ':volume:' + ':volume:_zfs_dataset -t fs -e "parent dataset"' ;; ("destroy") @@ -153,25 +153,20 @@ _zfs() { '-K[Create encryption key]' \ '-o[Set property]:property:_values -s , "property" $create_properties' \ ':snapshot:_zfs_dataset -t snap' \ - ':filesystem/volume:' + ':filesystem/volume:_zfs_dataset -t fs -e "parent dataset"' ;; ("promote") - # XXX complete only cloned filesystems _arguments \ - ':filesystem:_zfs_dataset -t fs' \ + ':filesystem:_zfs_dataset -t clone' \ ;; ("rename") _arguments -A "-*" \ - - set1 \ - '-p[Create parent datasets]' \ - ':filesystem/volume/snapshot:_zfs_dataset' \ - ':filesystem/volume/snapshot:' \ - - set2 \ - '-r[Recursively rename snapshots of all descendent datasets]' \ - ':snapshot:_zfs_dataset -t snap' \ - ':snapshot:' + '(-r)-p[Create parent datasets]' \ + '(-p)-r[Recursively rename snapshots of all descendent datasets]' \ + ':dataset:_zfs_dataset -r1' \ + ':dataset:_zfs_dataset -r2' ;; ("list") @@ -182,7 +177,7 @@ _zfs() { '-o[Properties to list]:property:_values -s , "property" $ro_properties $rw_propnames' \ '*-s[Sort key (ascending)]:property:_values "property" $ro_properties $rw_propnames' \ '*-S[Sort key (descending)]:property:_values "property" $ro_properties $rw_propnames' \ - '-t[Dataset types to list]:dataset type:_values -s , "dataset type" filesystem snapshot volume' \ + '-t[Dataset types to list]:dataset type:_values -s , "dataset type" all filesystem snapshot volume' \ '*:filesystem/volume/snapshot/path:_zfs_dataset -p' ;; diff --git a/Completion/Unix/Command/_zpool b/Completion/Unix/Command/_zpool index 568f493d0..0af2ab32d 100644 --- a/Completion/Unix/Command/_zpool +++ b/Completion/Unix/Command/_zpool @@ -1,5 +1,5 @@ #compdef zpool -# Synced with the S11U1 build 16 man page +# Synced with the S11U1 build 19 man page _zpool() { local context state line expl @@ -108,6 +108,7 @@ _zpool() { (create) # TODO: investigate better vdev handling _arguments -A "-*" \ + '-B[Create EFI boot partition on whole disks]' \ '-o[Set pool property at creation time]:property:_values -s , "property" $rw_props' \ '-O[Set dataset property at creation time]:property:_values -s , "property" $create_properties_dataset' \ '-f[Force use of in-use devices]' \ |