bash-completion: (lsblk) update columns

and fix lsblk --help output

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/bash-completion/lsblk b/bash-completion/lsblk
index f239e1940eb5cc9c3704dfc0bc4bd9d122365b5e..998d99ea00c3e535006a17412b999de343b3528a 100644 (file)
--- a/bash-completion/lsblk
+++ b/bash-completion/lsblk
@@ -6,11 +6,11 @@ _lsblk_module()
        prev="${COMP_WORDS[COMP_CWORD-1]}"
 
        LSBLK_COLS_ALL="
-               NAME KNAME MAJ:MIN FSTYPE MOUNTPOINT LABEL UUID PARTTYPE
-               PARTLABEL PARTUUID PARTFLAGS RA RO RM HOTPLUG MODEL SERIAL SIZE
-               STATE OWNER GROUP MODE ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC
-               ROTA SCHED RQ-SIZE TYPE DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO
-               WSAME WWN RAND PKNAME HCTL TRAN SUBSYSTEMS REV VENDOR
+               NAME KNAME PATH MAJ:MIN FSAVAIL FSSIZE FSTYPE FSUSED FSUSE% FSVER MOUNTPOINT
+               LABEL UUID PTUUID PTTYPE PARTTYPE PARTTYPENAME PARTLABEL PARTUUID PARTFLAGS RA
+               RO RM HOTPLUG MODEL SERIAL SIZE STATE OWNER GROUP MODE ALIGNMENT MIN-IO OPT-IO
+               PHY-SEC LOG-SEC ROTA SCHED RQ-SIZE TYPE DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO
+               WSAME WWN RAND PKNAME HCTL TRAN SUBSYSTEMS REV VENDOR ZONED DAX
        "
 
        case $prev in

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index f398a4b52a9b99d8734490201f056953216f24ba..03456b81c894c4891ae68ae31b9e9fabd934b9bd 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1814,7 +1814,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fprintf(out, USAGE_COLUMNS);
 
        for (i = 0; i < ARRAY_SIZE(infos); i++)
-               fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
+               fprintf(out, " %12s  %s\n", infos[i].name, _(infos[i].help));
 
        printf(USAGE_MAN_TAIL("lsblk(8)"));