diff options
| -rw-r--r-- | bash-completion/fdformat | 14 | ||||
| -rw-r--r-- | bash-completion/fdisk | 47 | ||||
| -rw-r--r-- | bash-completion/fsck.cramfs | 6 | ||||
| -rw-r--r-- | bash-completion/mkswap | 6 | ||||
| -rw-r--r-- | bash-completion/partx | 24 | ||||
| -rw-r--r-- | bash-completion/sfdisk | 34 | ||||
| -rw-r--r-- | disk-utils/partx.8 | 3 |
7 files changed, 121 insertions, 13 deletions
diff --git a/bash-completion/fdformat b/bash-completion/fdformat index d1b18fa04..09cb0a28d 100644 --- a/bash-completion/fdformat +++ b/bash-completion/fdformat @@ -5,12 +5,24 @@ _fdformat_module() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in + '-f'|'--from'|'-t'|'--to'|'-r'|'--repair') + COMPREPLY=( $(compgen -W "track_num" -- $cur) ) + return 0 + ;; '-h'|'--help'|'-V'|'--version') return 0 ;; esac DEVS=$(for I in echo /dev/fd*; do if [ -e $I ]; then echo $I; fi; done) - OPTS="--no-verify --help --version $DEVS" + OPTS=" + --from + --to + --repair + --no-verify + --help + --version + $DEVS + " COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 } diff --git a/bash-completion/fdisk b/bash-completion/fdisk index 0ba522ee4..ef6c5beb4 100644 --- a/bash-completion/fdisk +++ b/bash-completion/fdisk @@ -21,11 +21,46 @@ _fdisk_module() COMPREPLY=( $(compgen -W "auto never always" -- $cur) ) return 0 ;; + '--output') + local prefix realcur OUTPUT_ALL OUTPUT + realcur="${cur##*,}" + prefix="${cur%$realcur}" + OUTPUT_ALL=" + Attrs + Boot + Bsize + Cpg + Cylinders + Device + End + End-C/H/S + Flags + Fsize + Id + Name + Sectors + Size + Slice + Start + Start-C/H/S + Type + Type-UUID + UUID + " + for WORD in $OUTPUT_ALL; do + if ! [[ $prefix == *"$WORD"* ]]; then + OUTPUT="$WORD $OUTPUT" + fi + done + compopt -o nospace + COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- "$realcur") ) + return 0 + ;; '-u'|'--units') COMPREPLY=( $(compgen -W "cylinders sectors" -- $cur) ) return 0 ;; - '-C'|'--geom-cylinders'|'-H'|'--geom-heads'|'-S'|'--geom-sectors') + '-C'|'--cylinders'|'-H'|'--heads'|'-S'|'--sectors') COMPREPLY=( $(compgen -W "number" -- $cur) ) return 0 ;; @@ -40,12 +75,16 @@ _fdisk_module() --compatibility --color --list + --output --type --units --getsz - --geom-cylinders - --geom-heads - --geom-sectors + --bytes + --wipe + --wipe-partitions + --cylinders + --heads + --sectors --help --version" COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) diff --git a/bash-completion/fsck.cramfs b/bash-completion/fsck.cramfs index b3276b974..d17d2fea7 100644 --- a/bash-completion/fsck.cramfs +++ b/bash-completion/fsck.cramfs @@ -5,7 +5,11 @@ _fsck.cramfs_module() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in - '-x'|'--destination') + '-b'|'--blocksize') + COMPREPLY=( $(compgen -W "size" -- $cur) ) + return 0 + ;; + '--extract') local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) ) diff --git a/bash-completion/mkswap b/bash-completion/mkswap index b72efafd9..6ccc21421 100644 --- a/bash-completion/mkswap +++ b/bash-completion/mkswap @@ -17,7 +17,11 @@ _mkswap_module() COMPREPLY=( $(compgen -W "1" -- $cur) ) return 0 ;; - '-U'|'--uuid'|'-h'|'--help'|'-V'|'--version') + '-U'|'--uuid') + COMPREPLY=( $(compgen -W "$(uuidgen -r)" -- $cur) ) + return 0 + ;; + '-h'|'--help'|'-V'|'--version') return 0 ;; esac diff --git a/bash-completion/partx b/bash-completion/partx index 804787f9d..921666274 100644 --- a/bash-completion/partx +++ b/bash-completion/partx @@ -22,9 +22,13 @@ _partx_module() COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- $realcur) ) return 0 ;; + '-S'|'--sector-size') + COMPREPLY=( $(compgen -W "size" -- $cur) ) + return 0 + ;; '-t'|'--type') # FIXME: some command should list type libblkid knows. - COMPREPLY=( $(compgen -W "aix bsd dos gpt mac minix sgi solaris_x86 sun ultrix unixware" -- $cur) ) + COMPREPLY=( $(compgen -W "aix bsd dos gpt mac minix PMBR sgi solaris sun ultrix unixware" -- $cur) ) return 0 ;; '-h'|'--help'|'-V'|'--version') @@ -33,7 +37,23 @@ _partx_module() esac case $cur in -*) - OPTS="--add --delete --show --update --bytes --noheadings --nr --output --pairs --raw --type --verbose --help --version" + OPTS=" + --add + --delete + --update + --show + --bytes + --noheadings + --nr + --output + --pairs + --raw + --sector-size + --type + --verbose + --help + --version + " COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 ;; diff --git a/bash-completion/sfdisk b/bash-completion/sfdisk index f8ae1f1b0..c00e8c799 100644 --- a/bash-completion/sfdisk +++ b/bash-completion/sfdisk @@ -5,15 +5,37 @@ _sfdisk_module() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in - '-n'|'-C'|'--cylinders'|'-H'|'--heads'|'-S'|'--sectors') + '-d'|'--dump'|'-J'|'--json'|'-l'|'--list'|'-F'|'--list-free'|'-r'|'--reorder'|'-s'|'--show-size'|'-V'|'--verify'|'-A'|'--activate'|'--delete') + COMPREPLY=( $(compgen -W "$(lsblk -dpnro name)" -- $cur) ) + return 0 + ;; + '-N'|'--partno') COMPREPLY=( $(compgen -W "number" -- $cur) ) return 0 ;; - '--color') + '--color'|'-w'|'--wipe'|'-W'|'--wipe-partitions') COMPREPLY=( $(compgen -W "auto never always" -- $cur) ) return 0 ;; - '-O'|'-I') + '-o'|'--output') + local prefix realcur OUTPUT_ALL OUTPUT + realcur="${cur##*,}" + prefix="${cur%$realcur}" + OUTPUT_ALL=" + Attrs Boot Bsize Cpg Cylinders Device End + End-C/H/S Flags Fsize Id Name Sectors Size + Slice Start Start-C/H/S Type Type-UUID UUID + " + for WORD in $OUTPUT_ALL; do + if ! [[ $prefix == *"$WORD"* ]]; then + OUTPUT="$WORD $OUTPUT" + fi + done + compopt -o nospace + COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- "$realcur") ) + return 0 + ;; + '-O'|'--backup-file') local IFS=$'\n' compopt -o filenames COMPREPLY=( $(compgen -f -- $cur) ) @@ -35,9 +57,11 @@ _sfdisk_module() --show-geometry --list --list-free + --reorder --show-size --list-types --verify + --delete --part-label --part-type --part-uuid @@ -45,14 +69,18 @@ _sfdisk_module() --append --backup --bytes + --move-data --force --color --partno --no-act --no-reread + --no-tell-kernel --backup-file --output --quiet + --wipe + --wipe-partitions --label --label-nested --help diff --git a/disk-utils/partx.8 b/disk-utils/partx.8 index 0d47f1c54..2dd34f209 100644 --- a/disk-utils/partx.8 +++ b/disk-utils/partx.8 @@ -126,8 +126,9 @@ Specify the partition table type, which can be one of .BR gpt , .BR mac , .BR minix , +.BR PMBR , .BR sgi , -.BR solaris_x86 , +.BR solaris , .BR sun , .BR ultrix , or |