From: Sami Kerola <kerolasa@iki.fi>
Date: Mon, 20 May 2019 18:34:10 +0000 (+0100)
Subject: bash-completion: update options before release
X-Git-Tag: v2.34-rc2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba5e7b7e52831ea1846166b2d37333d3da2a1b99;p=thirdparty%2Futil-linux.git

bash-completion: update options before release

blkid: 5e91d5dd716ebc6144bcb0cabb0ec847a678be9e --no-part-details
lsblk: dc4662f0e755929de9cbe98b1b343b492fd620f4 --dedup
lsblk: 0bd05f5ee4876ffd13c98acd56c2bff9971f28f1 --merge
lscpu: 0e86bc8406959d0d56194d4f404b780e6b70caa4 --caches
lscpu: 2011528bce58dd31d5ee0287f2367da1f2d6cfa9 --bytes

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/bash-completion/blkid b/bash-completion/blkid
index 57b34c3f45..129a677cb0 100644
--- a/bash-completion/blkid
+++ b/bash-completion/blkid
@@ -85,6 +85,7 @@ _blkid_module()
 				--offset
 				--usages
 				--match-types
+				--no-part-details
 				--help
 				--version
 			"
diff --git a/bash-completion/lsblk b/bash-completion/lsblk
index bd86f9f797..a1e9e61b62 100644
--- a/bash-completion/lsblk
+++ b/bash-completion/lsblk
@@ -31,7 +31,7 @@ _lsblk_module()
 			COMPREPLY=( $(compgen -P "$prefix" -W "${MAJOR:-""}" -S ',' -- $realcur) )
 			return 0
 			;;
-		'-o'|'--output')
+		'-o'|'--output'|'-M'|'--dedup')
 			local prefix realcur LSBLK_COLS
 			realcur="${cur##*,}"
 			prefix="${cur%$realcur}"
@@ -66,6 +66,8 @@ _lsblk_module()
 				--json
 				--ascii
 				--list
+				--dedup
+				--merge
 				--perms
 				--noheadings
 				--output
diff --git a/bash-completion/lscpu b/bash-completion/lscpu
index 4d3582fd47..d79c4c9a65 100644
--- a/bash-completion/lscpu
+++ b/bash-completion/lscpu
@@ -30,6 +30,8 @@ _lscpu_module()
 		-*)
 			OPTS_ALL="--all
 				--online
+				--bytes
+				--caches
 				--offline
 				--json
 				--extended=