Add three new 'filters' for mode, type, and idle. 'mode' and 'type' work with each other to prevent a blk namespace from showing modes like 'dax' or 'memory', or if those modes are specified, then limiting 'type' to 'pmem'. Also show completions for --map= only if mode is 'memory'. For idle filtering (typically relevant for 'ndctl list', only show idle {namespaces, regions} in the completion id a --idle has been specified on the command line so far. This makes sense because trying to list an idle namespace without --idle (even if you know that is the one you want) won't show any output withot --idle. Signed-off-by: Vishal Verma <vishal.l.verma(a)intel.com&gt; --- Applies on top of the last bash-completion patch: "ndctl: bash completion updates for the --namespace= filter" contrib/ndctl | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/contrib/ndctl b/contrib/ndctl index b7a82fc..15ca3bf 100755 --- a/contrib/ndctl +++ b/contrib/ndctl @@ -110,6 +110,8 @@ __ndctl_get_regions() { local opts="--regions $*" [ -n "$bus_filter" ] && opts="$opts --bus=$bus_filter" + [ -n "$type_filter" ] && opts="$opts --type=$type_filter" + [ -n "$idle_filter" ] && opts="$opts --idle" echo "$(ndctl list $opts | grep -E "^\s*\"dev\":" | cut -d\" -f4)" } @@ -118,6 +120,8 @@ __ndctl_get_ns() opts="--namespaces $*" [ -n "$bus_filter" ] && opts="$opts --bus=$bus_filter" [ -n "$reg_filter" ] && opts="$opts --bus=$reg_filter" + [ -n "$type_filter" ] && opts="$opts --type=$type_filter" + [ -n "$idle_filter" ] && opts="$opts --idle" echo "$(ndctl list $opts | grep -E "^\s*\"dev\":" | cut -d\" -f4)" } @@ -147,7 +151,7 @@ __ndctl_comp_options() opts=$(__ndctl_get_dimms) ;; --namespace) - opts=$(__ndctl_get_ns -i) + opts=$(__ndctl_get_ns) ;; --reconfig) # It is ok to reconfig disabled namespaces @@ -155,12 +159,20 @@ __ndctl_comp_options() ;; --type) opts="pmem blk" + if [[ "$mode_filter" == @(dax|memory) ]]; then + opts="pmem" + fi ;; --mode) opts="raw sector memory dax" + if [[ "$type_filter" == "blk" ]]; then + opts="raw sector" + fi ;; --map) - opts="mem dev" + if [[ "$mode_filter" == "memory" ]]; then + opts="mem dev" + fi ;; *) return @@ -224,13 +236,13 @@ __ndctl_prev_skip_opts () done } -bus_filter='' -reg_filter='' - __ndctl_init_filters() { bus_filter='' reg_filter='' + type_filter='' + idle_filter='' + mode_filter='' for __word in "${words[@]}"; do if [[ "$__word" =~ --bus=(.*) ]]; then @@ -245,6 +257,15 @@ __ndctl_init_filters() local regions=$(__ndctl_get_regions -i) [[ "$regions" == *"$reg_filter"* ]] || reg_filter='' fi + if [[ "$__word" =~ --idle ]]; then + idle_filter="1" + fi + if [[ "$__word" =~ --type=(.*) ]]; then + type_filter="${BASH_REMATCH[1]}" + fi + if [[ "$__word" =~ --mode=(.*) ]]; then + mode_filter="${BASH_REMATCH[1]}" + fi done } -- 2.5.5