Use zoneadm -n, separate running and configured zones, add svccfg -z

Author: citrus-it

dladm

@@ -12,10 +12,6 @@ _dladm()
     if [[ ${prev} == 'dladm' ]]; then
       local cmds="$(dladm 2>&1 | awk '/^ / { print $1 }')"
       COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
-    elif [[ ${prev} =~ "-z" ]]; then
-      # Some illumos OS distributions have zone-aware dladm. Treat -z as a zone name option
-      local zones="$(zoneadm list -c | grep -v '^global$')"
-      COMPREPLY=( $(compgen -W "${zones}" -- ${cur}) )
     elif [[ ${prev} =~ 'delete-vnic' ]]; then
       # Redirect stderr to /dev/null not to polute console, e.g.:
       #   dladm: could not open /dev/dld: object not found

svcadm

@@ -25,7 +25,7 @@
 _gen_zoneadm_list()
 {
     if [[ ${prev} =~ "-z" ]]; then
-        local zones="$(zoneadm list -c | grep -v '^global$')"
+        local zones="$(zoneadm list -n)"
         COMPREPLY=( $(compgen -W "${zones}" -- ${cur}) )
     fi
 }

zones

@@ -31,43 +31,48 @@ _zlogin()
         esac
     else
       # Provide running zone names
-      local zones=$(zoneadm list | grep -v '^global$')
+      local zones=$(zoneadm list -n)
       COMPREPLY=( $(compgen -W "${zones}" -- ${cur}) )
     fi
 }
 
-# Many illumos utilities are zone-aware through the -z option
 _dash_z_zone()
 {
     local cur prev
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
     if [[ ${prev} =~ "-z" ]]; then
-      # Provide running zone names
-      local zones="$(zoneadm list -c | grep -v '^global$')"
+      local zones="$(zoneadm list -n $*)"
       COMPREPLY=( $(compgen -W "${zones}" -- ${cur}) )
     fi
 }
 
+_dash_z_zone_running() { _dash_z_zone; }
+_dash_z_zone_configured() { _dash_z_zone -c; }
+
+# Many illumos utilities are zone-aware through the -z option
+
 complete -F _zlogin zlogin
-complete -F _dash_z_zone allocate
-complete -F _dash_z_zone auditreduce
-complete -F _dash_z_zone deallocate
-complete -F _dash_z_zone ipfs
-complete -F _dash_z_zone ipfstat
-complete -F _dash_z_zone ipmon
-complete -F _dash_z_zone ipnat
-complete -F _dash_z_zone ippool
-complete -F _dash_z_zone pgrep
-complete -F _dash_z_zone pkill
-complete -F _dash_z_zone ps
-complete -F _dash_z_zone psrset
-complete -F _dash_z_zone ptree
-complete -F _dash_z_zone svcprop
-complete -F _dash_z_zone wall
-complete -F _dash_z_zone zoneadm
-complete -F _dash_z_zone zonecfg
+complete -F _dash_z_zone_running allocate
+complete -F _dash_z_zone_running deallocate
+complete -F _dash_z_zone_running ipfs
+complete -F _dash_z_zone_running ipfstat
+complete -F _dash_z_zone_running ipmon
+complete -F _dash_z_zone_running ipnat
+complete -F _dash_z_zone_running ippool
+complete -F _dash_z_zone_running pgrep
+complete -F _dash_z_zone_running pkill
+complete -F _dash_z_zone_running ps
+complete -F _dash_z_zone_running psrset
+complete -F _dash_z_zone_running ptree
+complete -F _dash_z_zone_running svccfg
+complete -F _dash_z_zone_running svcprop
+complete -F _dash_z_zone_running wall
+
+complete -F _dash_z_zone_configured auditreduce
+complete -F _dash_z_zone_configured zoneadm
+complete -F _dash_z_zone_configured zonecfg
 
 # ex: filetype=sh
 # vim: tabstop=2 shiftwidth=2 expandtab smartindent