master - fsadm: better check for getsize64 support
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b0333841352b76ce134...
Commit: b0333841352b76ce13464b82cb1876ea82b80351
Parent: 2183af62e56ff68e77eb29c7da9fcf2445b30eba
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Oct 25 20:19:31 2020 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Oct 26 13:06:52 2020 +0100
fsadm: better check for getsize64 support
Older blockdev tool return failure error code with --help,
and since now the tool abort on command failure, lets
detect missing --getsize64 support directly by running
command and check if it returns something usable.
It's likely very hard to have the system with
such old blockdev tool and newer lvm2 compiled.
---
scripts/fsadm.sh | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index 5bba5ff40..9b95d318d 100755
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -377,16 +377,13 @@ detect_mounted() {
# get the full size of device in bytes
detect_device_size() {
# check if blockdev supports getsize64
- "$BLOCKDEV" --help 2>&1 | "$GREP" getsize64 >"$NULL"
- if test $? -eq 0; then
- DEVSIZE=$("$BLOCKDEV" --getsize64 "$VOLUME")
+ DEVSIZE=$("$BLOCKDEV" --getsize64 "$VOLUME" 2>"$NULL" || true)
+ if test -n "$DEVSIZE" ; then
+ DEVSIZE=$("$BLOCKDEV" --getsize "$VOLUME" || true)
test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"."
- else
- DEVSIZE=$("$BLOCKDEV" --getsize "$VOLUME")
- test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"."
- SSSIZE=$("$BLOCKDEV" --getss "$VOLUME")
+ SSSIZE=$("$BLOCKDEV" --getss "$VOLUME" || true)
test -n "$SSSIZE" || error "Cannot read sector size of device \"$VOLUME\"."
- DEVSIZE=$(("$DEVSIZE" * "$SSSIZE"))
+ DEVSIZE=$(( $DEVSIZE * $SSSIZE ))
fi
}
3 years, 5 months
stable-2.02 - gcc: cleanup warns from older gcc
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=da7ec2ec0f19dca9266...
Commit: da7ec2ec0f19dca9266ecb2a653485491cae850a
Parent: 50ac89448fef4fc223e52f5a843b0709111006cb
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Oct 25 21:56:02 2020 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Oct 25 21:56:02 2020 +0100
gcc: cleanup warns from older gcc
---
lib/device/dev-md.c | 2 +-
lib/display/display.c | 4 ++--
lib/metadata/lv_manip.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c
index e345e926c..e28a8c183 100644
--- a/lib/device/dev-md.c
+++ b/lib/device/dev-md.c
@@ -173,7 +173,7 @@ static int _udev_dev_is_md(struct device *dev)
*/
static int _native_dev_is_md(struct device *dev, uint64_t *offset_found, int full)
{
- uint64_t size, sb_offset;
+ uint64_t size, sb_offset = 0;
int ret;
if (!scan_bcache)
diff --git a/lib/display/display.c b/lib/display/display.c
index d8220397b..e9cfaa985 100644
--- a/lib/display/display.c
+++ b/lib/display/display.c
@@ -407,9 +407,9 @@ int lvdisplay_full(struct cmd_context *cmd,
int lvm1compat;
dm_percent_t snap_percent;
int thin_pool_active = 0;
- dm_percent_t thin_data_percent, thin_metadata_percent;
+ dm_percent_t thin_data_percent = 0, thin_metadata_percent = 0;
int thin_active = 0;
- dm_percent_t thin_percent;
+ dm_percent_t thin_percent = 0;
struct lv_status_thin *thin_status = NULL;
struct lv_status_thin_pool *thin_pool_status = NULL;
struct lv_status_cache *cache_status = NULL;
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 7fc20b2fc..e96a04a69 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -7580,7 +7580,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
struct logical_volume *pool_lv = NULL;
struct logical_volume *tmp_lv;
const struct logical_volume *lock_lv;
- struct lv_segment *seg, *pool_seg;
+ struct lv_segment *seg = NULL, *pool_seg;
int thin_pool_was_active = -1; /* not scanned, inactive, active */
int historical;
uint64_t transaction_id;
3 years, 6 months
stable-2.02 - fsadm: fix bash artihmetic
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=50ac89448fef4fc223e...
Commit: 50ac89448fef4fc223e52f5a843b0709111006cb
Parent: a12574303d282779327bc93283edc72fd1b0772e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Oct 25 21:44:36 2020 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Oct 25 21:45:49 2020 +0100
fsadm: fix bash artihmetic
These shell vars needs to be without "".
---
scripts/fsadm.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index e20401be1..9b95d318d 100755
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -383,7 +383,7 @@ detect_device_size() {
test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"."
SSSIZE=$("$BLOCKDEV" --getss "$VOLUME" || true)
test -n "$SSSIZE" || error "Cannot read sector size of device \"$VOLUME\"."
- DEVSIZE=$(("$DEVSIZE" * "$SSSIZE"))
+ DEVSIZE=$(( $DEVSIZE * $SSSIZE ))
fi
}
3 years, 6 months
stable-2.02 - tests: minor update
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a12574303d282779327...
Commit: a12574303d282779327bc93283edc72fd1b0772e
Parent: 4dcb35cb03021f1ae450078f3e8bf55c40751a56
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Oct 25 20:23:41 2020 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Oct 25 20:23:41 2020 +0100
tests: minor update
---
test/shell/fsadm.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/shell/fsadm.sh b/test/shell/fsadm.sh
index 3e7f9083c..910edddd8 100644
--- a/test/shell/fsadm.sh
+++ b/test/shell/fsadm.sh
@@ -54,8 +54,8 @@ test ! -d "$mount_space_dir" && mkdir "$mount_space_dir"
cleanup_mounted_and_teardown()
{
- umount "$mount_dir" || true
- umount "$mount_space_dir" || true
+ umount "$mount_dir" 2>/dev/null || true
+ umount "$mount_space_dir" 2>/dev/null || true
aux teardown
}
3 years, 6 months
stable-2.02 - fsadm: better check for getsize64 support
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4dcb35cb03021f1ae45...
Commit: 4dcb35cb03021f1ae450078f3e8bf55c40751a56
Parent: 66ea26131ba1f6206eafe49c9c581a02fab00395
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Oct 25 20:19:31 2020 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Oct 25 20:19:31 2020 +0100
fsadm: better check for getsize64 support
Older blockdev tool return failure error code with --help,
and since now the tool abort on command failure, lets
detect missing --getsize64 support directly by running
command and check if it returns something usable.
It's likely very hard to have the system with
such old blockdev tool and newer lvm2 compiled.
---
scripts/fsadm.sh | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index 5bba5ff40..e20401be1 100755
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -377,14 +377,11 @@ detect_mounted() {
# get the full size of device in bytes
detect_device_size() {
# check if blockdev supports getsize64
- "$BLOCKDEV" --help 2>&1 | "$GREP" getsize64 >"$NULL"
- if test $? -eq 0; then
- DEVSIZE=$("$BLOCKDEV" --getsize64 "$VOLUME")
+ DEVSIZE=$("$BLOCKDEV" --getsize64 "$VOLUME" 2>"$NULL" || true)
+ if test -n "$DEVSIZE" ; then
+ DEVSIZE=$("$BLOCKDEV" --getsize "$VOLUME" || true)
test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"."
- else
- DEVSIZE=$("$BLOCKDEV" --getsize "$VOLUME")
- test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"."
- SSSIZE=$("$BLOCKDEV" --getss "$VOLUME")
+ SSSIZE=$("$BLOCKDEV" --getss "$VOLUME" || true)
test -n "$SSSIZE" || error "Cannot read sector size of device \"$VOLUME\"."
DEVSIZE=$(("$DEVSIZE" * "$SSSIZE"))
fi
3 years, 6 months
stable-2.02 - make: remove file from master
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=66ea26131ba1f6206ea...
Commit: 66ea26131ba1f6206eafe49c9c581a02fab00395
Parent: bb5f81624bc03d17a7e4ec57417b6bbcc5dc8ab8
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Oct 25 16:02:33 2020 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Oct 25 17:36:04 2020 +0100
make: remove file from master
To ensure lcov creation is not trying to pick wrong files
when using same machine for building stable-2.02 and master branch,
ensure the new files are being deleted even in stable-2.02
branch for 'make clean & make distclean' targets
---
base/Makefile | 6 ++++++
lib/Makefile.in | 12 ++++++++++++
libdm/Makefile.in | 5 +++++
3 files changed, 23 insertions(+)
diff --git a/base/Makefile b/base/Makefile
index 056ea5910..69ea118fc 100644
--- a/base/Makefile
+++ b/base/Makefile
@@ -33,6 +33,12 @@ $(BASE_TARGET): $(BASE_OBJECTS)
$(Q) $(RM) $@
$(Q) $(AR) rsv $@ $(BASE_OBJECTS) > /dev/null
+ifneq (,$(findstring $(MAKECMDGOALS),clean distclean))
+ BASE_SOURCE += \
+ base/data-struct/hash.c \
+ base/data-struct/list.c
+endif
+
ifeq ("$(DEPENDS)","yes")
-include $(BASE_DEPENDS)
endif
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1d422354c..358b7a704 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -152,6 +152,18 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
PROGS_CFLAGS = $(BLKID_CFLAGS) $(UDEV_CFLAGS)
+ifneq (,$(findstring $(MAKECMDGOALS),clean distclean))
+ SOURCES += \
+ integrity/integrity.c \
+ label/hints.c \
+ metadata/integrity_manip.c \
+ metadata/pv_list.c \
+ metadata/vdo_manip.c \
+ metadata/writecache_manip.c \
+ vdo/vdo.c \
+ writecache/writecache.c
+endif
+
include $(top_builddir)/make.tmpl
$(SUBDIRS): $(LIB_STATIC)
diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 66ec39513..46e55f089 100644
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -36,6 +36,11 @@ SOURCES =\
regex/ttree.c \
$(interface)/libdm-iface.c
+ifneq (,$(findstring $(MAKECMDGOALS),clean distclean))
+ SOURCES += \
+ dm-tools/dmsetup.c
+endif
+
INCLUDES = -I$(srcdir)/$(interface)
ifeq ("@STATIC_LINK@", "yes")
3 years, 6 months
stable-2.02 - cov: dmeventd plugin fix memleak
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bb5f81624bc03d17a7e...
Commit: bb5f81624bc03d17a7e4ec57417b6bbcc5dc8ab8
Parent: f5a2607bb194933caea62a88bd7fcc766efcd5cd
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Oct 15 14:21:55 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Oct 25 00:56:11 2020 +0200
cov: dmeventd plugin fix memleak
Fix memory leak when policy command fails too frequently and
plugin decided to skip it.
---
daemons/dmeventd/plugins/thin/dmeventd_thin.c | 2 +-
daemons/dmeventd/plugins/vdo/dmeventd_vdo.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
index 29b0391be..033094714 100644
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -286,7 +286,7 @@ void process_event(struct dm_task *dmt,
if (state->fails++ <= state->max_fails) {
log_debug("Postponing frequently failing policy (%u <= %u).",
state->fails - 1, state->max_fails);
- return;
+ goto out;
}
if (state->max_fails < MAX_FAILS)
state->max_fails <<= 1;
diff --git a/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c b/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
index 389632c60..6b35b2fe9 100644
--- a/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
+++ b/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
@@ -261,7 +261,7 @@ void process_event(struct dm_task *dmt,
if (state->fails++ <= state->max_fails) {
log_debug("Postponing frequently failing policy (%u <= %u).",
state->fails - 1, state->max_fails);
- return;
+ goto out;
}
if (state->max_fails < MAX_FAILS)
state->max_fails <<= 1;
3 years, 6 months
master - WHATS_NEW: update
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2183af62e56ff68e77e...
Commit: 2183af62e56ff68e77eb29c7da9fcf2445b30eba
Parent: edb55b767a45d6c7eb5194dea23c11b5ae5f71d3
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Oct 24 01:40:55 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sat Oct 24 01:42:16 2020 +0200
WHATS_NEW: update
---
WHATS_NEW | 2 ++
1 file changed, 2 insertions(+)
diff --git a/WHATS_NEW b/WHATS_NEW
index 16a8baf34..452a6317e 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
Version 2.03.11 -
==================================
+ Enhance error handling for fsadm and hanled correct fsck result.
+ Dmeventd lvm plugin ignores higher reserved_stack lvm.conf values.
Support using BLKZEROOUT for clearing devices.
Support interruption when wipping LVs.
Support interruption for bcache waiting.
3 years, 6 months
master - man: regenerate
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=edb55b767a45d6c7eb5...
Commit: edb55b767a45d6c7eb5194dea23c11b5ae5f71d3
Parent: 413c88116dd1a2a922216fd640598812b93ae3c9
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Oct 19 12:34:36 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sat Oct 24 01:42:16 2020 +0200
man: regenerate
---
man/lvchange.8_pregen | 5 ++---
man/lvconvert.8_pregen | 5 ++---
man/lvcreate.8_pregen | 5 ++---
man/lvdisplay.8_pregen | 5 ++---
man/lvextend.8_pregen | 5 ++---
man/lvm-fullreport.8_pregen | 5 ++---
man/lvm-lvpoll.8_pregen | 5 ++---
man/lvmconfig.8_pregen | 5 ++---
man/lvmdiskscan.8_pregen | 5 ++---
man/lvreduce.8_pregen | 5 ++---
man/lvremove.8_pregen | 5 ++---
man/lvrename.8_pregen | 5 ++---
man/lvresize.8_pregen | 5 ++---
man/lvs.8_pregen | 5 ++---
man/lvscan.8_pregen | 5 ++---
man/pvchange.8_pregen | 5 ++---
man/pvck.8_pregen | 5 ++---
man/pvcreate.8_pregen | 5 ++---
man/pvdisplay.8_pregen | 5 ++---
man/pvmove.8_pregen | 5 ++---
man/pvremove.8_pregen | 5 ++---
man/pvresize.8_pregen | 5 ++---
man/pvs.8_pregen | 5 ++---
man/pvscan.8_pregen | 5 ++---
man/vgcfgbackup.8_pregen | 5 ++---
man/vgcfgrestore.8_pregen | 5 ++---
man/vgchange.8_pregen | 5 ++---
man/vgck.8_pregen | 5 ++---
man/vgconvert.8_pregen | 5 ++---
man/vgcreate.8_pregen | 5 ++---
man/vgdisplay.8_pregen | 5 ++---
man/vgexport.8_pregen | 5 ++---
man/vgextend.8_pregen | 5 ++---
man/vgimport.8_pregen | 5 ++---
man/vgimportclone.8_pregen | 5 ++---
man/vgmerge.8_pregen | 5 ++---
man/vgmknodes.8_pregen | 5 ++---
man/vgreduce.8_pregen | 5 ++---
man/vgremove.8_pregen | 5 ++---
man/vgrename.8_pregen | 5 ++---
man/vgs.8_pregen | 5 ++---
man/vgscan.8_pregen | 5 ++---
man/vgsplit.8_pregen | 5 ++---
43 files changed, 86 insertions(+), 129 deletions(-)
diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index 51172f243..e133387af 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -1176,9 +1176,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 9e22c85ff..a47ccac08 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -1788,9 +1788,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index ee6903431..716db5053 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -1944,9 +1944,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index 4ba8dff18..9751b7656 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -497,9 +497,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index b7e4bca4b..3dd4d0f3f 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -652,9 +652,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 07e618a82..b6212a6f0 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -462,9 +462,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index d491e77ea..bbfa1216d 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -246,9 +246,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index 7f8e6c6e5..b2ab265ca 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -469,9 +469,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index 91a456712..62dc2afdd 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -221,9 +221,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 450ae80c7..9e3dbfe87 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -323,9 +323,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index 7798e132d..4635ec77c 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -314,9 +314,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 811f5a09b..1cfc887a8 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -250,9 +250,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index f1a67c4d1..83b060d86 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -587,9 +587,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index 8aea3566a..57b3736f9 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -493,9 +493,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index af1142785..0b782fedf 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -257,9 +257,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 33c63dc32..234a114a9 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -366,9 +366,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 1800714a9..eac6634ce 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -548,9 +548,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index aa893f4f1..781762521 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -479,9 +479,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index ef225cfb6..7c4500131 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -484,9 +484,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index e8413cb99..a34271ff8 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -356,9 +356,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index 89f8c0d15..784fcbe12 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -232,9 +232,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index 53ed2fda8..fc79a3a5f 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -227,9 +227,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index 596f593af..d85ae6cda 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -483,9 +483,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 94c42684f..27e1a773e 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -397,9 +397,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index 73a086863..6401ee4fb 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -278,9 +278,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index 71d2adab6..a174d7642 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -362,9 +362,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 10cf8a7ae..9016e76dd 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -1079,9 +1079,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index 2a1ec2364..9226dc4a6 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -252,9 +252,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index 48cf5e55d..09b6f1d31 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -294,9 +294,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index d8ebc2ae3..adef80999 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -497,9 +497,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index e65a53a62..f7db557b7 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -467,9 +467,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index 5018efd0e..a9a9dc6fb 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -277,9 +277,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index d2b4f7e56..40a34d9e0 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -363,9 +363,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index 03b7bdcb2..b82a1847e 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -275,9 +275,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index 11b8e7c0a..8cb048ffa 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -230,9 +230,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index b964e3a7b..03aa096eb 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -217,9 +217,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 199e7eb3e..4243b0923 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -252,9 +252,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index 7aed4d8b9..1f1d8d94e 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -382,9 +382,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index 703f3ba76..c715742ad 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -269,9 +269,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index 8085e0619..b9ac143e5 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -256,9 +256,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index 8726909f7..f50e43fbd 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -464,9 +464,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 68050c916..5d329f921 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -239,9 +239,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index f76a4db88..3adb0510f 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -332,9 +332,8 @@ Input units are always treated as base two values, regardless of
capitalization, e.g. 'k' and 'K' both refer to 1024.
The default input unit is specified by letter, followed by |UNIT.
UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
+b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,
+m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.
(This should not be confused with the output control --units, where
capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
3 years, 6 months
master - man: more precise UNIT
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=413c88116dd1a2a9222...
Commit: 413c88116dd1a2a922216fd640598812b93ae3c9
Parent: 9740e98cbdba114457dc20bf43ad4c4b8994876f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Oct 19 12:32:46 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sat Oct 24 01:42:16 2020 +0200
man: more precise UNIT
Since 'kilobytes' could be seen in 2 way - SI as '1000',
while all programmers sees it as '1024' - switch to
commonly acceptted KiB, MiB....
Resolves RHBZ 1496255.
---
tools/command.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 4fc55e2be..dd1f94194 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -3292,9 +3292,8 @@ static void _print_man_all_positions_desc(struct command_name *cname)
"capitalization, e.g. 'k' and 'K' both refer to 1024.\n"
"The default input unit is specified by letter, followed by |UNIT.\n"
"UNIT represents other possible input units: \\fBbBsSkKmMgGtTpPeE\\fP.\n"
- "b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,\n"
- "m|M is megabytes, g|G is gigabytes, t|T is terabytes,\n"
- "p|P is petabytes, e|E is exabytes.\n"
+ "b|B is bytes, s|S is sectors of 512 bytes, k|K is KiB,\n"
+ "m|M is MiB, g|G is GiB, t|T is TiB, p|P is PiB, e|E is EiB.\n"
"(This should not be confused with the output control --units, where\n"
"capital letters mean multiple of 1000.)\n");
3 years, 6 months