1 diff -ru zsh-5.0.5/Completion/Solaris/Command/_svcadm zsh-5.0.5/Completion/Solaris/Command/_svcadm |
1 --- zsh-5.0.5/Completion/Solaris/Command/_dladm Wed Nov 27 11:00:18 2013 |
|
2 +++ zsh-5.0.5/Completion/Solaris/Command/_dladm Fri Mar 28 16:00:53 2014 |
|
3 @@ -1,5 +1,5 @@ |
|
4 #compdef dladm |
|
5 -# Synced with the S11U1 build 19 man page |
|
6 +# Synced with the S11U2 build 34 man page |
|
7 |
|
8 _dladm_links() { |
|
9 compadd "$@" - $(dladm show-link -p -o link) |
|
10 @@ -61,15 +61,19 @@ |
|
11 compadd "$@" - $(dladm show-ib -p -o link) |
|
12 } |
|
13 |
|
14 +_dladm_eoiblinks() { |
|
15 + compadd "$@" - $(dladm show-eoib -p -o link) |
|
16 +} |
|
17 + |
|
18 _dladm() { |
|
19 local context state line expl |
|
20 typeset -A opt_args |
|
21 local -a subcmds |
|
22 local -a linkprops linkprops_general linkprops_nonvlanvnic linkprops_wifi |
|
23 - local -a linkprops_ether linkprops_ib linkprops_iptun |
|
24 - local -a link_properties link_stats_properties vnic_properties |
|
25 - local -a aggr_properties aggr_lacp_properties aggr_ext_properties |
|
26 - local -a vlan_properties wifi_properties wifi_connect_properties |
|
27 + local -a linkprops_ether linkprops_ib linkprops_iptun linkprops_aggr |
|
28 + local -a phys_properties link_properties vnic_properties |
|
29 + local -a aggr_properties aggr_lacp_properties aggr_dlmp_properties aggr_ext_properties |
|
30 + local -a vlan_properties wifi_properties wifi_connect_properties eoib_properties |
|
31 local -a ether_properties linkprop_properties secobj_properties |
|
32 local -a bridge_properties bridge_stats_properties bridge_link_properties |
|
33 local -a bridge_link_stats_properties bridge_fwd_properties |
|
34 @@ -81,7 +85,7 @@ |
|
35 # TODO: some subcommands may take different arguments based on options |
|
36 |
|
37 subcmds=( |
|
38 - "help" "show-ether" "show-ib" "show-usage" |
|
39 + "help" "show-ether" |
|
40 {"rename","show"}"-link" |
|
41 {"add","create","delete","modify","remove","show"}"-aggr" |
|
42 {"connect","disconnect","scan","show"}"-wifi" |
|
43 @@ -94,6 +98,7 @@ |
|
44 {"create","modify","delete","add","remove","show"}"-bridge" |
|
45 {"create","modify","delete","show"}"-iptun" |
|
46 {"create","delete","show"}"-part" |
|
47 + {"create","delete","show"}"-eoib" "show-ib" |
|
48 ) |
|
49 |
|
50 if [[ $service == "dladm" ]]; then |
|
51 @@ -110,10 +115,12 @@ |
|
52 fi |
|
53 |
|
54 link_properties=( "link" "zone" "class" "mtu" "state" "over" ) |
|
55 - link_stats_properties=( "link" "ipackets" "rbytes" "ierrors" "opackets" "obytes" "oerrors" ) |
|
56 |
|
57 + phys_properties=( "link" "media" "state" "speed" "duplex" "device" "vfs-avail" "vfs-inuse" "flags" ) |
|
58 + |
|
59 aggr_properties=( "link" "policy" "addrpolicy" "lacpactivity" "lacptimer" "mode" "flags" ) |
|
60 aggr_lacp_properties=( "link" "port" "aggregatable" "sync" "coll" "dist" "defaulted" "expired" ) |
|
61 + aggr_dlmp_properties=( "link" "port" "flags" "state" "targets" "xtargets" ) |
|
62 aggr_ext_properties=( "link" "port" "speed" "duplex" "state" "address" "portstate" ) |
|
63 |
|
64 vlan_properties=( "link" "vid" "over" "flags" ) |
|
65 @@ -123,11 +130,12 @@ |
|
66 |
|
67 ether_properties=( "link" "ptype" "state" "auto" "speed-duplex" "pause" "rem_fault" ) |
|
68 |
|
69 - linkprop_properties=( "link" "property" "value" "default" "possible" ) |
|
70 + linkprop_properties=( "link" "property" "value" "effective" "default" "possible" ) |
|
71 |
|
72 secobj_properties=( "object" "class" ) |
|
73 |
|
74 - vnic_properties=( "link" "over" "speed" "macaddr" "macaddrtype" ) |
|
75 + vnic_properties=( "link" "over" "speed" "macaddr" "macaddrtype" "macaddrtypes" |
|
76 + "vid" "vids" "evs" "vport" "tenant" "vfs-assigned" ) |
|
77 |
|
78 bridge_properties=( "bridge" "address" "priority" "bmaxage" "bhellotime" "bfwddelay" |
|
79 "forceproto" "tctime" "tccount" "tchange" "desroot" "rootcost" "rootport" |
|
80 @@ -144,23 +152,21 @@ |
|
81 |
|
82 part_properties=( "link" "pkey" "over" "state" "flags" ) |
|
83 |
|
84 - ib_properties=( "link" "hcaguid" "portguid" "port" "state" "pkeys" ) |
|
85 + ib_properties=( "link" "hcaguid" "portguid" "port" "state" "gwname" "gwport" "gwid" "gwflags" "pkeys" ) |
|
86 + eoib_properties=( "link" "gwname" "gwport" "gwid" "speed" "macaddress" "over" "flags" ) |
|
87 |
|
88 linkprops_general=( |
|
89 "autopush:streams modules:" |
|
90 "cos:value:(0 1 2 3 4 5 6 7)" |
|
91 "cpus:processors:" |
|
92 - "cpus-effective" |
|
93 "etsbw-lcl:percentage:" |
|
94 "etsbw-lcl-advice" |
|
95 - "etsbw-lcl-effective" |
|
96 - "etsbw-rmt-effective" |
|
97 + "etsbw-rmt-advice" |
|
98 + "iov:value:(auto inherit on off)" |
|
99 "lro:value:(off on auto)" |
|
100 - "lro-effective" |
|
101 "mac-address:MAC address:" |
|
102 "maxbw:bandwith:" |
|
103 "pool:pools:" |
|
104 - "pool-effective" |
|
105 "priority:priority:(high medium low)" |
|
106 "rxringsavail" |
|
107 "rxrings:value:" |
|
108 @@ -176,13 +182,10 @@ |
|
109 "stp_mcheck:value:(0 1)" |
|
110 "protection:value:(mac-nospoof ip-nospoof dhcp-nospoof restricted)" |
|
111 "vsi-mgrid:IPv6 address:" |
|
112 - "vsi-mgrid-effective" |
|
113 "vsi-mgrid-enc:encoding:(oracle_v1 none)" |
|
114 - "vsi-mgrid-enc-effective" |
|
115 "vsi-typeid:value:" |
|
116 - "vsi-typeid-effective" |
|
117 "vsi-vers:value:" |
|
118 - "vsi-vers-effective" |
|
119 + "vswitching:value:(local remote auto)" |
|
120 "zone:value:_zones" |
|
121 ) |
|
122 linkprops_nonvlanvnic=( |
|
123 @@ -190,7 +193,6 @@ |
|
124 "learn_decay:value:" |
|
125 "learn_limit:value:" |
|
126 "rxfanout:value:" |
|
127 - "rxfanout-effective:value:" |
|
128 "stp:value:(0 1)" |
|
129 ) |
|
130 linkprops_wifi=( |
|
131 @@ -218,13 +220,11 @@ |
|
132 "en_10fdx_cap:value:(0 1)" |
|
133 "en_10hdx_cap:value:(0 1)" |
|
134 "flowctrl:value:(auto no rx tx pfc bi)" |
|
135 - "flowctrl-effective" |
|
136 "gvrp-timeout:value:" |
|
137 "mtu:value:" |
|
138 "ntcs" |
|
139 "pfcmap:value:" |
|
140 - "pfcmap-lcl-effective" |
|
141 - "pfcmap-rmt-effective" |
|
142 + "pfcmap-rmt" |
|
143 "speed" |
|
144 "tagmode:value:(normal vlanonly)" |
|
145 "vlan-announce:value:(off gvrp)" |
|
146 @@ -236,9 +236,14 @@ |
|
147 "hoplimit:value:" |
|
148 "encaplimit:value:" |
|
149 ) |
|
150 + linkprops_aggr=( |
|
151 + "probe-enabled:value:(true false)" |
|
152 + "probe-ip:value:" |
|
153 + "probe-fdt" |
|
154 + ) |
|
155 linkprops=( |
|
156 $linkprops_general $linkprops_wifi $linkprops_ether |
|
157 - $linkprops_ib $linkprops_iptun |
|
158 + $linkprops_ib $linkprops_iptun $linkprops_aggr |
|
159 ) |
|
160 |
|
161 case $service in |
|
162 @@ -252,12 +257,7 @@ |
|
163 '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
164 '-Z[Display ZONE column in output]' \ |
|
165 '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
166 - - set1 \ |
|
167 '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $link_properties' \ |
|
168 - - set2 \ |
|
169 - '(-s --statistics)'{-s,--statistics}'[Display link statistics]' \ |
|
170 - '(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \ |
|
171 - '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $link_stats_properties' \ |
|
172 ':link name:_dladm_links' |
|
173 ;; |
|
174 |
|
175 @@ -273,14 +273,15 @@ |
|
176 '-D[Show Data Center Bridging information]:featureset:(ets pfc)' \ |
|
177 '-H[Show hardware resource usage]' \ |
|
178 '-L[Display location information]' \ |
|
179 + '-l[For ETS DCB, show additional local information]' \ |
|
180 + '-r[For ETS DCB, show additional remote information]' \ |
|
181 '(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \ |
|
182 '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
183 '-m[Display MAC address information]' \ |
|
184 + '-V[Display SR-IOV information]' \ |
|
185 '-Z[Display ZONE column in output]' \ |
|
186 '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
187 - '(-s --statistics)'{-s,--statistics}'[Display link statistics]' \ |
|
188 - '(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \ |
|
189 - '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" link media state speed duplex device' \ |
|
190 + '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $phys_properties' \ |
|
191 ':physical link name:_dladm_devs' |
|
192 ;; |
|
193 |
|
194 @@ -304,7 +305,7 @@ |
|
195 |
|
196 ("modify-aggr") |
|
197 _arguments -A "-*" \ |
|
198 - '(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \ |
|
199 + '(-t --temporary)'{-t,--temporary}'[Modifications should be temporary]' \ |
|
200 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
201 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
202 '(-m --mode)'{-m,--mode}'[Aggregation mode]:mode:(dlmp trunk)' \ |
|
203 @@ -324,7 +325,7 @@ |
|
204 |
|
205 ("add-aggr") |
|
206 _arguments -A "-*" \ |
|
207 - '(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \ |
|
208 + '(-t --temporary)'{-t,--temporary}'[Additions should be temporary]' \ |
|
209 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
210 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
211 ':aggregate link name:_dladm_aggrs' |
|
212 @@ -332,7 +333,7 @@ |
|
213 |
|
214 ("remove-aggr") |
|
215 _arguments -A "-*" \ |
|
216 - '(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \ |
|
217 + '(-t --temporary)'{-t,--temporary}'[Removals should be temporary]' \ |
|
218 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
219 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_aggr_ports' \ |
|
220 ':aggregate link name:_dladm_aggrs' |
|
221 @@ -342,8 +343,6 @@ |
|
222 _arguments -A "-*" \ |
|
223 '(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \ |
|
224 '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
225 - '(-s --statistics)'{-s,--statistics}'[Display link statistics]' \ |
|
226 - '(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \ |
|
227 '-Z[Display ZONE column in output]' \ |
|
228 '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
229 ':aggregate link name:_dladm_links' \ |
|
230 @@ -352,6 +351,9 @@ |
|
231 - lacp \ |
|
232 '(-L --lacp)'{-L,--lacp}'[LACP information]' \ |
|
233 '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_lacp_properties' \ |
|
234 + - dlmp \ |
|
235 + '-S[Display detailed probe information]' \ |
|
236 + '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_dlmp_properties' \ |
|
237 - extended \ |
|
238 '(-x --extended)'{-x,--extended}'[Extended information]' \ |
|
239 '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_ext_properties' |
|
240 @@ -376,7 +378,7 @@ |
|
241 |
|
242 ("modify-vlan") |
|
243 _arguments -A "-*" \ |
|
244 - '(-t --temporary)'{-t,--temporary}'[VLAN should be temporary]' \ |
|
245 + '(-t --temporary)'{-t,--temporary}'[Modifications should be temporary]' \ |
|
246 '(-f --force)'{-f,--force}'[Force VLAN creation]' \ |
|
247 '(-R --root-dir)'{-R,--root-dir}'[Root directory]:directory:_path_files -/' \ |
|
248 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
249 @@ -474,7 +476,7 @@ |
|
250 |
|
251 ("create-secobj") |
|
252 _arguments -A "-*" \ |
|
253 - '(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \ |
|
254 + '(-t --temporary)'{-t,--temporary}'[Object should be temporary]' \ |
|
255 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
256 '(-c --class)'{-c,--class}'[Class]:class:(wep wpa)' \ |
|
257 '(-f --file)'{-f,--file}'[File containing object value]:file:_path_files' \ |
|
258 @@ -499,12 +501,17 @@ |
|
259 ("create-vnic") |
|
260 # TODO: MAC address completion could be richer |
|
261 _arguments -A "-*" \ |
|
262 - '(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \ |
|
263 + '(-t --temporary)'{-t,--temporary}'[VNIC should be temporary]' \ |
|
264 + - nonEVS \ |
|
265 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
266 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
267 '(-m --mac-address)'{-m,--mac-address}'[MAC address]:address:(factory random auto vrrp)' \ |
|
268 '-v[VLAN ID]:id:' \ |
|
269 '(-p --prop)'{-p,--prop}'[Property values]:value:_values -s , "property" ${(M)linkprops_general\:#*\:*}' \ |
|
270 + ':VNIC name:' \ |
|
271 + - EVS \ |
|
272 + '(-c --connect)'{-c,--connect}'[Elastic Virtual Switch name]:evs name: ' \ |
|
273 + '(-T --tenant)'{-T,--tenant}'[Tenant name]:tenant: ' \ |
|
274 ':VNIC name:' |
|
275 ;; |
|
276 |
|
277 @@ -518,7 +525,7 @@ |
|
278 ("modify-vnic") |
|
279 # TODO: MAC address completion could be richer |
|
280 _arguments -A "-*" \ |
|
281 - '(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \ |
|
282 + '(-t --temporary)'{-t,--temporary}'[Modifications should be temporary]' \ |
|
283 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
284 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
285 '(-m --mac-address)'{-m,--mac-address}'[MAC address]:address:(factory random auto vrrp)' \ |
|
286 @@ -536,8 +543,8 @@ |
|
287 '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
288 '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $vnic_properties' \ |
|
289 '(-l --link)'{-l,--link}'[Limit to VNICs on link]:link:_dladm_links' \ |
|
290 - '(-s --statistics)'{-s,--statistics}'[Display VNIC statistics]' \ |
|
291 - '(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \ |
|
292 + '-c[Display EVS information]' \ |
|
293 + '-V[Display SR-IOV information]' \ |
|
294 '-Z[Display ZONE column in output]' \ |
|
295 '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
296 ':VNIC name:_dladm_vnics' |
|
297 @@ -545,7 +552,7 @@ |
|
298 |
|
299 ("create-etherstub") |
|
300 _arguments -A "-*" \ |
|
301 - '(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \ |
|
302 + '(-t --temporary)'{-t,--temporary}'[Etherstub should be temporary]' \ |
|
303 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
304 ':etherstub name:' |
|
305 ;; |
|
306 @@ -564,16 +571,6 @@ |
|
307 ':etherstub name:_dladm_etherstubs' |
|
308 ;; |
|
309 |
|
310 - ("show-usage") |
|
311 - _arguments -A "-*" \ |
|
312 - '(-f --file)'{-f,--file}'[Read records from file]:file:_path_files' \ |
|
313 - '(-F --format)'{-F,--format}'[Plotfile format]:plotfile format:(gnuplot)' \ |
|
314 - '(-p --plot)'{-p,--plot}'[Write plot to file]:' \ |
|
315 - '(-e --start)'{-e,--start}'[Start time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \ |
|
316 - '(-s --stop)'{-s,--stop}'[Stop time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \ |
|
317 - ':link name:_dladm_links' |
|
318 - ;; |
|
319 - |
|
320 ("create-bridge") |
|
321 _arguments -A "-*" \ |
|
322 '(-P --protect)'{-P,--protect}'[Specify a protection method]:protection method:(stp trill)' \ |
|
323 @@ -587,7 +584,6 @@ |
|
324 ':bridge name:' |
|
325 ;; |
|
326 |
|
327 - |
|
328 ("modify-bridge") |
|
329 _arguments -A "-*" \ |
|
330 '(-P --protect)'{-P,--protect}'[Specify a protection method]:protection method:(stp trill)' \ |
|
331 @@ -600,7 +596,6 @@ |
|
332 ':bridge name:_dladm_bridges' |
|
333 ;; |
|
334 |
|
335 - |
|
336 ("delete-bridge") |
|
337 _arguments -A "-*" \ |
|
338 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
339 @@ -607,7 +602,6 @@ |
|
340 ':bridge name:_dladm_bridges' |
|
341 ;; |
|
342 |
|
343 - |
|
344 ("add-bridge"|"remove-bridge") |
|
345 _arguments -A "-*" \ |
|
346 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
347 @@ -615,7 +609,6 @@ |
|
348 ':bridge name:_dladm_bridges' |
|
349 ;; |
|
350 |
|
351 - |
|
352 ("show-bridge") |
|
353 # XXX $bridge_stats_properties get added into -o completions for set1 |
|
354 # XXX $bridge_link_stats_properties get added into -o completions for set3 |
|
355 @@ -644,10 +637,9 @@ |
|
356 ':bridge name:_dladm_bridges' |
|
357 ;; |
|
358 |
|
359 - |
|
360 ("create-iptun") |
|
361 _arguments -A "-*" \ |
|
362 - '(-t --temporary)'{-t,--temporary}'[Temporary tunnel]' \ |
|
363 + '(-t --temporary)'{-t,--temporary}'[Tunnel should be temporary]' \ |
|
364 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
365 '(-T --type)'{-T,--type}'[Tunnel type]:tunnel type:(ipv4 ipv6 6to4)' \ |
|
366 '(-a --address)'{-a,--address}'[Endpoint addresses]:address/host:_values -s , "address/host" $tunnel_values' \ |
|
367 @@ -656,7 +648,7 @@ |
|
368 |
|
369 ("modify-iptun") |
|
370 _arguments -A "-*" \ |
|
371 - '(-t --temporary)'{-t,--temporary}'[Temporary modification]' \ |
|
372 + '(-t --temporary)'{-t,--temporary}'[Modifications should be temporary]' \ |
|
373 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
374 '(-a --address)'{-a,--address}'[Endpoint addresses]:address/host:_values -s , "address/host" $tunnel_values' \ |
|
375 ':tunnel name:_dladm_iptuns' |
|
376 @@ -664,7 +656,7 @@ |
|
377 |
|
378 ("delete-iptun") |
|
379 _arguments -A "-*" \ |
|
380 - '(-t --temporary)'{-t,--temporary}'[Temporary deletion]' \ |
|
381 + '(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \ |
|
382 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
383 ':tunnel name:_dladm_iptuns' |
|
384 ;; |
|
385 @@ -681,7 +673,7 @@ |
|
386 |
|
387 ("create-part") |
|
388 _arguments -A "-*" \ |
|
389 - '(-t --temporary)'{-t,--temporary}'[Temporary partition]' \ |
|
390 + '(-t --temporary)'{-t,--temporary}'[Partition should be temporary]' \ |
|
391 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
392 '(-f --force)'{-f,--force}'[Force partition creation]' \ |
|
393 '(-l --link)'{-l,--link}'[IP-over-IB physical link name]:IB link:_dladm_iblinks' \ |
|
394 @@ -692,7 +684,7 @@ |
|
395 |
|
396 ("delete-part") |
|
397 _arguments -A "-*" \ |
|
398 - '(-t --temporary)'{-t,--temporary}'[Temporary deletion]' \ |
|
399 + '(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \ |
|
400 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
401 ':link name:_dladm_parts' |
|
402 ;; |
|
403 @@ -714,6 +706,35 @@ |
|
404 ':IB link name:_dladm_iblinks' |
|
405 ;; |
|
406 |
|
407 + ("create-eoib") |
|
408 + _arguments -A "-*" \ |
|
409 + '(-t --temporary)'{-t,--temporary}'[EoIB Link should be temporary]' \ |
|
410 + '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
411 + '(-l --link)'{-l,--link}'[InfiniBand link]:IB link:_dladm_iblinks' \ |
|
412 + '(-g --gateway)'{-g,--gateway}'[Gateway name]:gateway name: ' \ |
|
413 + '-c[Gateway ethernet port]:gateway port: ' \ |
|
414 + ':EoIB link name:' |
|
415 + ;; |
|
416 + |
|
417 + ("delete-eoib") |
|
418 + _arguments -A "-*" \ |
|
419 + '(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \ |
|
420 + '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
421 + ':EoIB link name:_dladm_eoiblinks' |
|
422 + ;; |
|
423 + |
|
424 + ("show-eoib") |
|
425 + _arguments -A "-*" \ |
|
426 + '(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \ |
|
427 + '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
428 + '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $eoib_properties' \ |
|
429 + '(-g --gateway)'{-g,--gateway}'[Gateway name]:gateway name: ' \ |
|
430 + '(-l --link)'{-l,--link}'[InfiniBand link]:IB link:_dladm_iblinks' \ |
|
431 + '-Z[Display ZONE column in output]' \ |
|
432 + '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
433 + ':EoIB link name:_dladm_eoiblinks' |
|
434 + ;; |
|
435 + |
|
436 (*) |
|
437 _message "unknown dladm subcommand: $service" |
|
438 ;; |
|
439 --- zsh-5.0.5/Completion/Solaris/Command/_flowadm Wed Nov 27 11:00:18 2013 |
|
440 +++ zsh-5.0.5/Completion/Solaris/Command/_flowadm Fri Mar 28 11:07:23 2014 |
|
441 @@ -1,5 +1,5 @@ |
|
442 #compdef flowadm |
|
443 -# Synced with the S11U1 build 19 man page |
|
444 +# Synced with the S11U2 build 34 man page |
|
445 |
|
446 _flowadm() { |
|
447 |
|
448 @@ -35,6 +35,8 @@ |
|
449 |
|
450 props=( |
|
451 "maxbw" |
|
452 + "priority" |
|
453 + "hwflow" |
|
454 ) |
|
455 |
|
456 if [[ $service == "flowadm" ]]; then |
|
457 @@ -56,7 +58,7 @@ |
|
458 |
|
459 ("show-flow") |
|
460 _arguments -A "-*" \ |
|
461 - '-o[specify field to display]:field:(flow link ipaddr proto port dsfield)' \ |
|
462 + '-o[specify field to display]:field:(flow link proto laddr lport raddr rport port dsfield pid)' \ |
|
463 '-p[parsable output]' \ |
|
464 '-P[persistent flow property information]' \ |
|
465 - set1 \ |
|
466 --- zsh-5.0.5/Completion/Solaris/Command/_ipadm Wed Nov 27 11:00:18 2013 |
|
467 +++ zsh-5.0.5/Completion/Solaris/Command/_ipadm Fri Mar 28 16:02:55 2014 |
|
468 @@ -1,5 +1,5 @@ |
|
469 #compdef ipadm |
|
470 -# Synced with the S11U1 build 19 man page |
|
471 +# Synced with the S11U2 build 34 man page |
|
472 |
|
473 _ipadm_ifs() { |
|
474 local -a extra |
|
475 @@ -122,11 +122,13 @@ |
|
476 |
|
477 addrobj_properties=( |
|
478 "addrobj" "type" "state" "current" "persistent" "addr" |
|
479 - "cid-type" "cid-value" "begin" "expire" "renew" |
|
480 + "cid-type" "cid-value" "begin" "expire" "renew" "vrrp-router" |
|
481 ) |
|
482 |
|
483 - proto_ipv4_properties=( "hostmodel" "ttl" "forwarding" ) |
|
484 - proto_ipv6_properties=( "hostmodel" "hoplimit" "forwarding" ) |
|
485 + proto_ipv4_properties=( "arp_publish_count" "arp_publish_interval" "hostmodel" |
|
486 + "ttl" "forwarding" "ndp_unsolicit_count" "ndp_unsolicit_interval" "send_redirects" ) |
|
487 + proto_ipv6_properties=( "arp_publish_count" "arp_publish_interval" "hostmodel" |
|
488 + "hoplimit" "forwarding" "ndp_unsolicit_count" "ndp_unsolicit_interval" "send_redirects" ) |
|
489 proto_tcp_properties=( "cong_default" "cong_enabled" "ecn" "extra_priv_ports" "max_buf" "recv_buf" |
|
490 "send_buf" "sack" "smallest_anon_port" "largest_anon_port" "smallest_nonpriv_port" ) |
|
491 proto_udp_properties=( "extra_priv_ports" "max_buf" "recv_buf" "send_buf" "smallest_anon_port" |
|
492 @@ -265,7 +267,7 @@ |
|
493 case ${opt_args[-T]#-T:} in |
|
494 ("static:"*) |
|
495 local -a addrthingsv4 |
|
496 - addrthingsv4=( "local:address: " "remote:address: ") |
|
497 + addrthingsv4=( "local:address: " "remote:address: " ) |
|
498 _arguments -A "-*" \ |
|
499 '(-d --down)'{-d,--down}'[Address should be marked down]' \ |
|
500 '(-a --address)'{-a,--address}'[Address specification]:address:_values -s , "address" $addrthingsv4' \ |
|
501 @@ -281,7 +283,7 @@ |
|
502 |
|
503 ("addrconf:"*) |
|
504 local -a addrthingsv6 statefulness |
|
505 - addrthingsv6=( "local:interface id: " "remote:interface id: ") |
|
506 + addrthingsv6=( "local:interface id: " "remote:interface id: " ) |
|
507 statefulness=( "stateful:statefulness:(yes no)" "stateless:statelessness:(yes no)" ) |
|
508 _arguments -A "-*" \ |
|
509 '(-i --interface-id)'{-i,--interface-id}'[Interface ID]:address:_values -s , "interface id" $addrthingsv6' \ |
|
510 @@ -288,6 +290,16 @@ |
|
511 '(-p --prop)'{-p,--prop}'[Statefulness configuration]:statefulness configuration:_values -s , "statefulness" $statefulness' \ |
|
512 ':address object name:_ipadm_addrobjs_or_ifs' |
|
513 ;; |
|
514 + |
|
515 + ("vrrp:"*) |
|
516 + local -a addrthingsvrrp |
|
517 + addrthingsvrrp=( "local:address: " ) |
|
518 + _arguments -A "-*" \ |
|
519 + '(-a --address)'{-a,--address}'[Address specification]:address:_values -s , "address" $addrthingsvrrp' \ |
|
520 + '-n[VRRP router name]:router name: ' \ |
|
521 + ':address object name:_ipadm_addrobjs_or_ifs' |
|
522 + ;; |
|
523 + |
|
524 (*) |
|
525 _wanted commands expl "address type" compadd static dhcp addrconf |
|
526 ;; |
|
527 --- zsh-5.0.5/Completion/Solaris/Command/_netstat Wed Nov 27 11:00:18 2013 |
|
528 +++ zsh-5.0.5/Completion/Solaris/Command/_netstat Fri Mar 28 10:12:57 2014 |
|
529 @@ -1,4 +1,5 @@ |
|
530 #compdef netstat |
|
531 +# Synced with the S11U2 build 34 man page |
|
532 |
|
533 _netstat() { |
|
534 local -a f_rules |
|
535 @@ -18,6 +19,7 @@ |
|
536 '-v[verbose]' \ |
|
537 '-f[specify address family]:address family:(inet inet6 unix)' \ |
|
538 '-P[specify protocol]:protocol:(ip ipv6 icmp icmpv6 igmp udp tcp rawip)' \ |
|
539 + '-u[show user, pid, and program owning the network endpoint]' \ |
|
540 - set2 \ |
|
541 '-r[show routing table]' \ |
|
542 '-f[filter routing table]:rule:(($f_rules))' \ |
2 --- zsh-5.0.5/Completion/Solaris/Command/_svcadm Thu Jan 2 14:23:56 2014 |
543 --- zsh-5.0.5/Completion/Solaris/Command/_svcadm Thu Jan 2 14:23:56 2014 |
3 +++ zsh-5.0.5/Completion/Solaris/Command/_svcadm Tue Jan 7 16:11:20 2014 |
544 +++ zsh-5.0.5/Completion/Solaris/Command/_svcadm Tue Jan 7 16:11:20 2014 |
4 @@ -23,8 +23,8 @@ |
545 @@ -23,8 +23,8 @@ |
5 (enable) |
546 (enable) |
6 _arguments -A "-*" \ |
547 _arguments -A "-*" \ |
63 + '-s[Synchronous mode: wait for the transition to the new milestone]' \ |
604 + '-s[Synchronous mode: wait for the transition to the new milestone]' \ |
64 + '-T[Timeout for synchronous mode]:seconds:' \ |
605 + '-T[Timeout for synchronous mode]:seconds:' \ |
65 '*:milestone FMRI:_svcs_fmri -m' |
606 '*:milestone FMRI:_svcs_fmri -m' |
66 ;; |
607 ;; |
67 |
608 |
68 diff -ru zsh-5.0.5/Completion/Unix/Command/_zpool zsh-5.0.5/Completion/Unix/Command/_zpool |
609 --- zsh-5.0.5/Completion/Solaris/Command/_svcs Wed Nov 27 11:00:18 2013 |
69 --- zsh-5.0.5/Completion/Unix/Command/_zpool Tue Jan 7 16:11:20 2014 |
610 +++ zsh-5.0.5/Completion/Solaris/Command/_svcs Fri Mar 28 10:10:24 2014 |
70 +++ zsh-5.0.5/Completion/Unix/Command/_zpool Thu Jan 2 14:23:56 2014 |
611 @@ -1,4 +1,5 @@ |
|
612 #compdef svcs |
|
613 +# Synced with the S11U2 build 34 man page |
|
614 |
|
615 _svcs() { |
|
616 local -a cols |
|
617 @@ -11,19 +12,20 @@ |
|
618 ) |
|
619 |
|
620 _arguments -s \ |
|
621 - '(-l -x -d -D)-a[list all instances]' \ |
|
622 - '(-l -x -D -a -R)-d[list dependencies]' \ |
|
623 - '(-l -x -d -a -R)-D[list dependents]' \ |
|
624 - '(-l -x)-H[suppress header line]' \ |
|
625 + '(-l -L -x -d -D)-a[list all instances]' \ |
|
626 + '(-l -L -x -D -a -R)-d[list dependencies]' \ |
|
627 + '(-l -L -x -d -a -R)-D[list dependents]' \ |
|
628 + '(-l -L -x)-H[suppress header line]' \ |
|
629 '(-x -d -D -a -R -s)-l[print detailed status about services and instances]' \ |
|
630 - '(-l -x)-o[display specific columns]:column:_values -s , "column" ${^cols/\:/[}\]' \ |
|
631 - '(-l -x)-p[list processes]' \ |
|
632 - '(-l -x -d -D)-R[list services with the given restarter]:instance FMRI:_svcs_fmri -i' \ |
|
633 - '(-l -x)-s[sort by a column]:column:(($cols))' \ |
|
634 - '(-l -x)-S[reverse sort by a column]:column:(($cols))' \ |
|
635 + '(-a -d -D -H -l -o -p -R -s -S)-L[print path to service logfile]' \ |
|
636 + '(-l -L -x)-o[display specific columns]:column:_values -s , "column" ${^cols/\:/[}\]' \ |
|
637 + '(-l -L -x)-p[list processes]' \ |
|
638 + '(-l -L -x -d -D)-R[list services with the given restarter]:instance FMRI:_svcs_fmri -i' \ |
|
639 + '(-l -L -x)-s[sort by a column]:column:(($cols))' \ |
|
640 + '(-l -L -x)-S[reverse sort by a column]:column:(($cols))' \ |
|
641 '-v[verbose columns]' \ |
|
642 '(-l)-x[display explanation for service states]' \ |
|
643 - '(-l -x)-\?[print help]' \ |
|
644 + '(-l -L -x)-\?[print help]' \ |
|
645 '*:FMRI or pattern:_svcs_fmri -i' |
|
646 } |
|
647 |
|
648 --- zsh-5.0.5/Completion/Solaris/Command/_zlogin Wed Nov 27 11:00:18 2013 |
|
649 +++ zsh-5.0.5/Completion/Solaris/Command/_zlogin Fri Mar 28 10:06:07 2014 |
|
650 @@ -1,5 +1,5 @@ |
|
651 #compdef zlogin |
|
652 -# Synced with the Nevada build 162 man page |
|
653 +# Synced with the S11U2 build 34 man page |
|
654 |
|
655 _zlogin() { |
|
656 _arguments -s \ |
|
657 @@ -6,6 +6,8 @@ |
|
658 '-E[Disable escape character]' \ |
|
659 '-e[Specify escape character]:character:' \ |
|
660 '-l[Specify username]:username:_users' \ |
|
661 + '-T[Enter immutable zone as a "Trusted Path Domain" member]' \ |
|
662 + '-U[Like -T, but "unsafe"]' \ |
|
663 ':zonename:_zones' \ |
|
664 - set1 \ |
|
665 '-C[Connect to zone console]' \ |
|
666 --- zsh-5.0.5/Completion/Solaris/Command/_zoneadm Thu Jan 2 14:23:56 2014 |
|
667 +++ zsh-5.0.5/Completion/Solaris/Command/_zoneadm Sat Mar 29 11:19:44 2014 |
|
668 @@ -1,20 +1,22 @@ |
|
669 #compdef zoneadm |
|
670 -# Synced with the S11U1 man page |
|
671 +# Synced with the S11U2 build 34 man page |
|
672 |
|
673 _zoneadm_bootargs() { |
|
674 # This is a subset of the arguments to kernel(1M) |
|
675 _arguments -A "-*" \ |
|
676 - '-i[Alternate init]:path:_path_files' \ |
|
677 '-m[SMF options]:option:_values "SMF option" debug milestone= quiet verbose' \ |
|
678 - '-s[Boot single user]' |
|
679 + '-s[Boot single user]' \ |
|
680 + '-L[List available boot environments]' \ |
|
681 + '-Z[Boot a named environment]:boot environment: ' |
|
682 } |
|
683 |
|
684 _zoneadm() { |
|
685 local context state line expl |
|
686 typeset -A opt_args |
|
687 - local -a subcmds fields |
|
688 - local -a solaris_attach solaris_install |
|
689 - local -a solaris10_attach solaris10_install |
|
690 + local -a subcmds subcmds_solariskz fields |
|
691 + local -a solaris_attach solaris_clone solaris_install |
|
692 + local -a solariskz_attach solariskz_clone solariskz_install |
|
693 + local -a solaris10_attach solaris10_clone solaris10_install |
|
694 local -a extended_create_options extended_destroy_options |
|
695 local brand brand_args |
|
696 |
|
697 @@ -22,11 +24,19 @@ |
|
698 attach boot clone detach halt help install list mark move |
|
699 ready reboot uninstall verify |
|
700 ) |
|
701 + subcmds_solariskz=( |
|
702 + savecore suspend |
|
703 + ) |
|
704 |
|
705 extended_create_options=( |
|
706 + "cert:certificate:_path_files" |
|
707 + "cacert:CA certificate:_path_files" |
|
708 + "force-takeover" |
|
709 "force-zpool-import" |
|
710 "force-zpool-create:ZFS pool: " |
|
711 "force-zpool-create-all" |
|
712 + "initialize-hostdata" |
|
713 + "key:key:_path_files" |
|
714 ) |
|
715 |
|
716 extended_destroy_options=( |
|
717 @@ -35,28 +45,44 @@ |
|
718 ) |
|
719 |
|
720 solaris_attach=( |
|
721 - '(-d)-a[Path to archive]:path:_path_files' |
|
722 - '(-a)-d[Path to zonepath]:directory:_path_files -/' |
|
723 + '-c[Specify configuration profile]:path:_files -g \*.xml' |
|
724 + '-U[Update all packages to latest versions]' |
|
725 + '-z[Attach existing zone boot environment]:zone boot environment: ' |
|
726 ) |
|
727 + solaris_clone=( |
|
728 + '-c[Specify configuration profile]:path:_files -g \*.xml' |
|
729 + ) |
|
730 solaris_install=( |
|
731 + '-c[Specify configuration profile]:path:_files -g \*.xml' |
|
732 - set1 |
|
733 - '-c[Path to certificate]:path:_path_files' |
|
734 - '*-e[Additional package]:package:' |
|
735 - '-k[Path to key]:path:_path_files' |
|
736 - '-P[Publisher/URI mapping]:publisher:' |
|
737 + '-m[Specify install (AI) manifest]:path:_files -g \*.xml' |
|
738 - set2 |
|
739 '(-d)-a[Path to archive]:path:_path_files' |
|
740 - '(-a)-d[Path to installed zone root]:directory:path_files -/' |
|
741 + '(-a -z)-d[Path to installed zone root]:directory:path_files -/' |
|
742 '-p[Preserve system configuration]' |
|
743 '-s[Install silently]' |
|
744 '-u[Unconfigure after installation]' |
|
745 '-v[Verbose]' |
|
746 + '(-d)-z[Name of zone in unified archive]:zone: ' |
|
747 ) |
|
748 |
|
749 + solariskz_attach=() |
|
750 + solariskz_clone=( $solaris_clone ) |
|
751 + solariskz_install=( |
|
752 + '-a(-m)[Specify unified archive]:path:_path_files' |
|
753 + '-b[Specify boot media]:path:_path_files' |
|
754 + '-c[Specify configuration profile]:path:_path_files' |
|
755 + '-m(-a)[Specify install (AI) manifest]:path:_path_files' |
|
756 + '-S[Specify root filesystem size]:size: ' |
|
757 + '-v[Verbose]' |
|
758 + '-z[Name of zone in unified archive]:zone: ' |
|
759 + ) |
|
760 + |
|
761 solaris10_attach=( |
|
762 '(-d)-a[Path to archive]:path:_path_files' |
|
763 '(-a)-d[Path to zonepath]:directory:_path_files -/' |
|
764 ) |
|
765 + solaris10_clone=() |
|
766 solaris10_install=( |
|
767 '(-d)-a[Path to archive]:path:_path_files' |
|
768 '(-a)-d[Path to installed zone root]:directory:path_files -/' |
|
769 @@ -70,9 +96,15 @@ |
|
770 _arguments -C -A "-*" \ |
|
771 '-R[Alternate root]:alternate root:_path_files -/' \ |
|
772 '-u[Zone UUID]:zone UUID: ' \ |
|
773 - '-z[Zone name]:zone name:_zones' \ |
|
774 + '-z[Zone name]:zone name:_zones -t c' \ |
|
775 '*::command:->subcmd' && return 0 |
|
776 |
|
777 + if [[ -n $opt_args[-z] ]]; then |
|
778 + brand=${${"${(@s,:,)$(zoneadm -z $opt_args[-z] list -p)}"[6]}//-/} |
|
779 + brand_args=subcmds_${brand} |
|
780 + subcmds=( ${(P)brand_args} $subcmds ) |
|
781 + fi |
|
782 + |
|
783 if (( CURRENT == 1 )); then |
|
784 _wanted commands expl "zoneadm subcommand" compadd -a subcmds |
|
785 return |
|
786 @@ -85,6 +117,7 @@ |
|
787 ("boot") |
|
788 # Completion of boot arguments after -- is kinda hacky. |
|
789 _arguments -S -A "-*" \ |
|
790 + '-R[Force new boot instead of resume]' \ |
|
791 '-w[Force writable root]' \ |
|
792 '-W[Boot in transient r/w mode]' \ |
|
793 '*:boot options:_zoneadm_bootargs' |
|
794 @@ -91,16 +124,21 @@ |
|
795 ;; |
|
796 |
|
797 ("clone") |
|
798 + if [[ -n $opt_args[-z] ]]; then |
|
799 + brand=${${"${(@s,:,)$(zoneadm -z $opt_args[-z] list -p)}"[6]}//-/} |
|
800 + brand_args=${brand}_clone |
|
801 + fi |
|
802 _arguments -A "-*" \ |
|
803 '-m[Clone mode]:mode:_values "mode" copy' \ |
|
804 '-s[Source snapshot]:snapshot:_zfs_dataset -t snap' \ |
|
805 '-x[Extended options]:extended option:_values -w "extended option" $extended_create_options' \ |
|
806 - ':source zone:_zones' |
|
807 + ${(P)brand_args} \ |
|
808 + ':source zone:_zones -t i' |
|
809 ;; |
|
810 |
|
811 ("attach") |
|
812 if [[ -n $opt_args[-z] ]]; then |
|
813 - brand=${"${(@s,:,)$(zoneadm -z $opt_args[-z] list -p)}"[6]} |
|
814 + brand=${${"${(@s,:,)$(zoneadm -z $opt_args[-z] list -p)}"[6]}//-/} |
|
815 brand_args=${brand}_attach |
|
816 fi |
|
817 _arguments -A "-*" \ |
|
818 @@ -116,7 +154,7 @@ |
|
819 '-n[Dry run]' |
|
820 ;; |
|
821 |
|
822 - ("halt"|"ready"|"reboot"|"verify") |
|
823 + ("halt"|"ready"|"reboot"|"verify"|"suspend") |
|
824 ;; |
|
825 |
|
826 |
|
827 @@ -126,7 +164,7 @@ |
|
828 |
|
829 ("install") |
|
830 if [[ -n $opt_args[-z] ]]; then |
|
831 - brand=${"${(@s,:,)$(zoneadm -z $opt_args[-z] list -p)}"[6]} |
|
832 + brand=${${"${(@s,:,)$(zoneadm -z $opt_args[-z] list -p)}"[6]}//-/} |
|
833 brand_args=${brand}_install |
|
834 fi |
|
835 _arguments -A "-*" \ |
|
836 @@ -152,6 +190,12 @@ |
|
837 ':new zone path:_path_files -/' |
|
838 ;; |
|
839 |
|
840 + ("savecore") |
|
841 + _arguments -A "-*" \ |
|
842 + "-L[Don't pause zone]" \ |
|
843 + '-f[Path to dumpfile]:path:_path_files' |
|
844 + ;; |
|
845 + |
|
846 ("uninstall") |
|
847 _arguments -A "-*" \ |
|
848 '-F[Force]' \ |
|
849 --- zsh-5.0.5/Completion/Unix/Command/_pgrep Wed Nov 27 11:00:19 2013 |
|
850 +++ zsh-5.0.5/Completion/Unix/Command/_pgrep Sat Mar 29 09:41:30 2014 |
|
851 @@ -1,32 +1,71 @@ |
|
852 -#compdef pgrep pkill |
|
853 +#compdef pgrep pkill |
|
854 |
|
855 local context state line ret=1 expl |
|
856 typeset -A opt_args |
|
857 typeset -a arguments |
|
858 |
|
859 -arguments=('-P[parent process id]:parent process id:->ppid' |
|
860 - '-g[match only in process group ids]:group:->pgid' |
|
861 - '-G[match only real group id]:group:_groups' |
|
862 - '-s[match only session id]:session id:->sid' |
|
863 +arguments=('-P[parent process id]:parent process id:->ppid' |
|
864 + '-F[match only in process in pidfile]:files:_files' |
|
865 + '-g[match only in process group ids]:group:->pgid' |
|
866 + '-G[match only real group id]:group:_groups' |
|
867 + '-j[match only in processes inside jails]:jail id:->jid' |
|
868 + '-J[match only in project ids]:project id:->projid' |
|
869 + '-M[extract the name list from the specified core]:files:_files' |
|
870 + '-N[extract the name list from the specified system]:files:_files' |
|
871 + '-s[match only session id]:session id:->sid' |
|
872 '-t[match only controlled by terminal]:terminal device:->tty' |
|
873 - '-u[match only effective user id]:user:_users' |
|
874 - '-U[match only real user id]:user:_users' |
|
875 - '(-n)-o[oldest process]' |
|
876 - '(-o)-n[newest process]' |
|
877 - '-f[match against full command line]' |
|
878 - '-v[negate matching]' |
|
879 - '-x[match exactly]' |
|
880 - '*:process name:->pname') |
|
881 + '-T[match only in processes specified routing table in rtable]' |
|
882 + '-u[match only effective user id]:user:_users' |
|
883 + '-U[match only real user id]:user:_users' |
|
884 + '(-n)-o[oldest process]' |
|
885 + '(-o)-n[newest process]' |
|
886 + '-a[include process ancestors in the match list]' |
|
887 + '-c[print a count of matching processes]' |
|
888 + '-f[match against full command line]' |
|
889 + '-i[ignore case distinctions]' |
|
890 + '-I[confirmation before attempting to single each process]' |
|
891 + '-L[given pidfile must be locked]' |
|
892 + '-q[do not write anything to standard output]' |
|
893 + '-S[search also in system processes]' |
|
894 + '-v[negate matching]' |
|
895 + '-x[match exactly]' |
|
896 + '-z[match only in zones]:zone:_zones') |
|
897 |
|
898 -if [[ $service == 'pkill' ]] |
|
899 -then |
|
900 +if [[ $service == 'pkill' ]]; then |
|
901 arguments+=('-'${^signals}'[signal]') |
|
902 -elif [[ $service == 'pgrep' ]] |
|
903 -then |
|
904 +elif [[ $service == 'pgrep' ]]; then |
|
905 arguments+=('-d[output delimiter]:delimiter:compadd ${(s\:\:)IFS}' |
|
906 '-l[list name in addition to id]') |
|
907 fi |
|
908 |
|
909 +local optchars |
|
910 +case "$OSTYPE" in |
|
911 + linux*) |
|
912 + optchars="cflvxdnoPgsuUGt" |
|
913 + ;; |
|
914 + freebsd*) |
|
915 + optchars="LSafilnoqvxFGMNPUdgjstu" |
|
916 + ;; |
|
917 + openbsd*) |
|
918 + optchars="flnoqvxdGgPsTtUu" |
|
919 + ;; |
|
920 + darwin*) |
|
921 + optchars="LafilnoqvxFGPUdgtu" |
|
922 + ;; |
|
923 + solaris*) |
|
924 + optchars="flvxdnoPgsuUGJtTcz" |
|
925 + arguments=( ${arguments##-T*} ) |
|
926 + arguments=( ${arguments##-c*} ) |
|
927 + arguments+=( '-T[match only processes in task ids]:taskid:->task' ) |
|
928 + arguments+=( '-c[match only processes in contract ids]:taskid:->contract' ) |
|
929 + ;; |
|
930 + *) |
|
931 + optchars="flvxdnoPgsuUGt" |
|
932 + ;; |
|
933 +esac |
|
934 +arguments=( ${(M)arguments:#(|\*)(|\(*\))-[$optchars]*} |
|
935 + '*:process name:->pname') |
|
936 + |
|
937 _arguments -s -w $arguments && ret=0 |
|
938 |
|
939 case $state in |
|
940 @@ -39,23 +78,45 @@ |
|
941 ttys=( /dev/tty*(N) /dev/pts/*(N) ) |
|
942 _wanted tty expl 'terminal device' compadd -S ',' -q -F used ${ttys#/dev/} |
|
943 ;; |
|
944 - |
|
945 + |
|
946 (sid) |
|
947 + if [[ $OSTYPE == openbsd* ]]; then |
|
948 + break |
|
949 + fi |
|
950 + |
|
951 compset -P '*,' |
|
952 |
|
953 local -a used sid |
|
954 used=(${(s:,:)IPREFIX}) |
|
955 - sid=(${(uon)$(ps -A o sid=)}) |
|
956 + if [[ $OSTYPE == freebsd* ]]; then |
|
957 + sid=(${(uon)$(ps -ax -o sid=)}) |
|
958 + else |
|
959 + sid=(${(uon)$(ps -A -o sid=)}) |
|
960 + fi |
|
961 |
|
962 _wanted sid expl 'session id' compadd -S ',' -q -F used $sid |
|
963 ;; |
|
964 - |
|
965 + |
|
966 + (jid) |
|
967 + compset -P '*,' |
|
968 + |
|
969 + local -a used jid |
|
970 + used=(${(s:,:)IPREFIX}) |
|
971 + jid=(${(uon)$(ps -ax -o jid=)}) |
|
972 + |
|
973 + _wanted jid expl 'jail id' compadd -S ',' -q -F used $jid |
|
974 + ;; |
|
975 + |
|
976 (ppid) |
|
977 compset -P '*,' |
|
978 |
|
979 local -a used ppid |
|
980 used=(${(s:,:)IPREFIX}) |
|
981 - ppid=(${(uon)$(ps -A o ppid=)}) |
|
982 + if [[ $OSTYPE == (freebsd|openbsd|darwin)* ]]; then |
|
983 + ppid=(${(uon)$(ps -ax -o ppid=)}) |
|
984 + else |
|
985 + ppid=(${(uon)$(ps -A -o ppid=)}) |
|
986 + fi |
|
987 |
|
988 _wanted ppid expl 'parent process id' compadd -S ',' -q -F used $ppid |
|
989 ;; |
|
990 @@ -65,25 +126,77 @@ |
|
991 |
|
992 local -a used pgid |
|
993 used=(${(s:,:)IPREFIX}) |
|
994 - pgid=(${(uon)$(ps -A o pgid=)}) |
|
995 + if [[ $OSTYPE == (freebsd|openbsd|darwin)* ]]; then |
|
996 + pgid=(${(uon)$(ps -ax -o pgid=)}) |
|
997 + else |
|
998 + pgid=(${(uon)$(ps -A -o pgid=)}) |
|
999 + fi |
|
1000 |
|
1001 _wanted pgid expl 'process group id' compadd -S ',' -q -F used $pgid |
|
1002 ;; |
|
1003 - |
|
1004 + |
|
1005 + (projid) |
|
1006 + compset -P '*,' |
|
1007 + |
|
1008 + local -a used projid |
|
1009 + used=(${(s:,:)IPREFIX}) |
|
1010 + projid=(${(uon)$(ps -A -o project=)}) |
|
1011 + |
|
1012 + _wanted projid expl 'project id' compadd -S ',' -q -F used $projid |
|
1013 + ;; |
|
1014 + |
|
1015 + (contract) |
|
1016 + compset -P '*,' |
|
1017 + |
|
1018 + local -a used ctid |
|
1019 + used=(${(s:,:)IPREFIX}) |
|
1020 + ctid=(${(uon)$(ps -A -o ctid=)}) |
|
1021 + |
|
1022 + _wanted ctid expl 'contract id' compadd -S ',' -q -F used $ctid |
|
1023 + ;; |
|
1024 + |
|
1025 + (task) |
|
1026 + compset -P '*,' |
|
1027 + |
|
1028 + local -a used taskid |
|
1029 + used=(${(s:,:)IPREFIX}) |
|
1030 + taskid=(${(uon)$(ps -A -o project=)}) |
|
1031 + |
|
1032 + _wanted taskid expl 'task id' compadd -S ',' -q -F used $taskid |
|
1033 + ;; |
|
1034 + |
|
1035 (pname) |
|
1036 local ispat="pattern matching " |
|
1037 - if (( ${+opt_args[-x]} )) |
|
1038 - then |
|
1039 + if (( ${+opt_args[-x]} )); then |
|
1040 ispat="" |
|
1041 fi |
|
1042 - if (( ${+opt_args[-f]} )) |
|
1043 - then |
|
1044 - _wanted pname expl $ispat'process command line' compadd ${(u)${(f)"$(ps -A o cmd=)"}} |
|
1045 + |
|
1046 + local command |
|
1047 + if (( ${+opt_args[-f]} )); then |
|
1048 + if [[ "$OSTYPE" == freebsd* ]] && (( ${+opt_args[-S]} )); then |
|
1049 + command="$(ps -axH -o command=)" |
|
1050 + elif [[ "$OSTYPE" == (freebsd|openbsd|darwin)* ]]; then |
|
1051 + command="$(ps -ax -o command=)" |
|
1052 + elif [[ "$OSTYPE" == solaris* ]]; then |
|
1053 + command="$(ps -A -o args=)" |
|
1054 + else |
|
1055 + command="$(ps -A o cmd=)" |
|
1056 + fi |
|
1057 + _wanted pname expl $ispat'process command line' compadd ${(u)${(f)${command}}} |
|
1058 else |
|
1059 - _wanted pname expl $ispat'process name' compadd ${(u)${(f)"$(ps -A co cmd=)"}} |
|
1060 + if [[ "$OSTYPE" == freebsd* ]] && (( ${+opt_args[-S]} )); then |
|
1061 + command="$(ps -axcH -o command=)" |
|
1062 + elif [[ "$OSTYPE" == (freebsd|openbsd|darwin)* ]]; then |
|
1063 + command="$(ps -axc -o command=)" |
|
1064 + elif [[ "$OSTYPE" == solaris* ]]; then |
|
1065 + command="$(ps -A -o comm=)" |
|
1066 + else |
|
1067 + command="$(ps -A co cmd=)" |
|
1068 + fi |
|
1069 + _wanted pname expl $ispat'process name' compadd ${(u)${(f)${command}}} |
|
1070 fi |
|
1071 ;; |
|
1072 - |
|
1073 + |
|
1074 esac && ret=0 |
|
1075 |
|
1076 return ret |
|
1077 --- zsh-5.0.5/Completion/Unix/Command/_zfs Thu Jan 2 14:23:56 2014 |
|
1078 +++ zsh-5.0.5/Completion/Unix/Command/_zfs Sat Mar 29 11:35:15 2014 |
|
1079 @@ -1,5 +1,5 @@ |
|
1080 #compdef zfs |
|
1081 -# Synced with the S11U1 man page |
|
1082 +# Synced with the S11U2 build 34 man page |
|
1083 |
|
1084 _zfs() { |
|
1085 local context state line expl |
|
1086 @@ -121,7 +121,7 @@ |
|
1087 |
|
1088 share_rw_properties=( |
|
1089 "share.desc:description:" |
|
1090 - "share.noauto:value:(on off)" |
|
1091 + "share.auto:value:(on off)" |
|
1092 "share.path:path:" |
|
1093 $share_nfs_rw_properties |
|
1094 $share_smb_rw_properties |
|
1095 @@ -306,8 +306,8 @@ |
|
1096 '-d[Depth]:value:' \ |
|
1097 '-H[Scripting mode]' \ |
|
1098 '-p[Display numbers exactly]' \ |
|
1099 - '-s[Specify sources]:source:_values -s , "source" local default inherited temporary none' \ |
|
1100 - '-o[Specify fields]:field:_values -s , "field" name property value source' \ |
|
1101 + '-s[Specify sources]:source:_values -s , "source" local default inherited received temporary none' \ |
|
1102 + '-o[Specify fields]:field:_values -s , "field" name property received value source' \ |
|
1103 ':property:_values -s , "property" $ro_properties $rw_propnames all' \ |
|
1104 '*:filesystem/volume/snapshot:_zfs_dataset' |
|
1105 ;; |
|
1106 @@ -381,11 +381,13 @@ |
|
1107 |
|
1108 ("send") |
|
1109 _arguments -A "-*" \ |
|
1110 - '-b' \ |
|
1111 + '-b[Send only received property values]' \ |
|
1112 '-i[Generate an incremental stream]:snapshot:_zfs_dataset -t snap' \ |
|
1113 '-D[Perform dedup processing]' \ |
|
1114 + "-n[Don't send the stream]" \ |
|
1115 '-p[Send properties]' \ |
|
1116 - '-v[Verbose]' \ |
|
1117 + '(-v)-s[Specifies information to be sent to stderr]:token:(streamsize)' \ |
|
1118 + '(-s)-v[Verbose]' \ |
|
1119 - set1 \ |
|
1120 '-I[Generate an incremental stream with intermediary snapshots]:snapshot:_zfs_dataset -t snap' \ |
|
1121 '-R[Generate a replication stream package]' \ |
|
1122 --- zsh-5.0.5/Completion/Unix/Command/_zpool Thu Jan 2 14:23:56 2014 |
|
1123 +++ zsh-5.0.5/Completion/Unix/Command/_zpool Fri Mar 28 13:56:56 2014 |
|
1124 @@ -1,5 +1,5 @@ |
|
1125 #compdef zpool |
|
1126 -# Synced with the S11U1 man page |
|
1127 +# Synced with the S11U2 build 34 man page |
|
1128 |
|
1129 _zpool() { |
|
1130 local context state line expl |
71 @@ -105,7 +105,7 @@ |
1131 @@ -105,7 +105,7 @@ |
72 ':command/property:($subcmds ${fields%%\[*} properties)' \ |
1132 ':command/property:($subcmds ${fields%%\[*} properties)' \ |
73 - set2 \ |
1133 - set2 \ |
74 '-l[Display property information]' \ |
1134 '-l[Display property information]' \ |
75 - ': :(properties)' |
1135 - ': :(properties)' |
76 + ':help topics:(properties)' |
1136 + ':help topics:(properties)' |
77 ;; |
1137 ;; |
78 |
1138 |
79 (clear) |
1139 (clear) |
80 @@ -241,7 +241,6 @@ |
1140 @@ -126,8 +126,10 @@ |
|
1141 '-f[Force use of in-use devices]' \ |
|
1142 '-l[Display configuration in /dev/chassis location form]' \ |
|
1143 '-n[Display configuration without creating pool]' \ |
|
1144 + "-N[Create pool but don't mount or share]" \ |
|
1145 '-R[Use alternate root]:alternate root:_files -/' \ |
|
1146 '-m[Set mountpoint for root dataset]:mountpoint:' \ |
|
1147 + '-t[Use a temporary pool name]:pool name: ' \ |
|
1148 ':pool name:' \ |
|
1149 '*:virtual device:_files' |
|
1150 ;; |
|
1151 @@ -237,11 +239,11 @@ |
|
1152 '-n[With -F; do not perform input]' \ |
|
1153 '-R[Alternate root]:alternate root:_files -/' \ |
|
1154 '-o[Set pool or dataset property]:property:_values -s , "property" $create_properties_dataset $rw_props' \ |
|
1155 + '-t[Use a temporary pool name]:pool name: ' \ |
|
1156 - set1 \ |
81 '*:pool name or id:_zfs_pool' \ |
1157 '*:pool name or id:_zfs_pool' \ |
82 '::new pool name:' \ |
1158 '::new pool name:' \ |
83 - set2 \ |
1159 - set2 \ |
84 - '-N[Do not mount any filesystems]' \ |
1160 - '-N[Do not mount any filesystems]' \ |
85 '-a[All pools]' |
1161 '-a[All pools]' |