lsfd: align --help output

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

diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index 8c366e68e2c1976ccb872c5e24b041a32cc339f0..cfc1948b5c35411ff088ef4d348ed4147a544862 100644 (file)
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -1459,7 +1459,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("          --summary[=<when>]  print summary information (only, append, or never)\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       printf(USAGE_HELP_OPTIONS(23));
+       printf(USAGE_HELP_OPTIONS(30));
 
        fprintf(out, USAGE_COLUMNS);
 

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index cc09c659600ee0ea8c05e79161d88d642004be24..0574f23d1dd97a703bb3b20d2a50dd6cbc847546 100644 (file)
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 fdformat:  
 flock:  
@@ -94,6 +96,7 @@ newgrp:  libcrypt
 nologin:  
 nsenter:  
 pg:  libncursesw libtinfo 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -119,6 +122,7 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 vipw:  
+waitpid:  
 wall:  
 whereis:  
 write:  

diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index cc09c659600ee0ea8c05e79161d88d642004be24..0574f23d1dd97a703bb3b20d2a50dd6cbc847546 100644 (file)
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 fdformat:  
 flock:  
@@ -94,6 +96,7 @@ newgrp:  libcrypt
 nologin:  
 nsenter:  
 pg:  libncursesw libtinfo 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -119,6 +122,7 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 vipw:  
+waitpid:  
 wall:  
 whereis:  
 write:  

diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index 4031db08699b496eda9ffe1896dbcc8a2079ab36..bdcd0872dfee4a285fb4a3efee812ff9515f3628 100644 (file)
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -90,6 +92,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -113,5 +116,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser
index 0059b381237cf5d647b93d3b6fd9deea9208deab..97e1ae605603fe4c3444c7f99984c5d0d48bb28e 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-libuser
+++ b/tests/expected/build-sys/config-chfnsh-libuser
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -87,9 +89,10 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-namei:  
+namei:  libselinux 
 nologin:  
 nsenter:  libselinux 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -113,5 +116,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password
index 35d5f722d2fe28132c1c93abad487168ca434d69..734113e3aa2aaf46bdafc59b94c621dd3f6cf4b1 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-no-password
+++ b/tests/expected/build-sys/config-chfnsh-no-password
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -87,9 +89,10 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-namei:  
+namei:  libselinux 
 nologin:  
 nsenter:  libselinux 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -113,5 +116,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam
index eae24a293d63b78965bbfffcbde107fc724891a0..532013c993a7cf7e0d88348fddb04c29bb82c3f8 100644 (file)
--- a/tests/expected/build-sys/config-chfnsh-pam
+++ b/tests/expected/build-sys/config-chfnsh-pam
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -87,9 +89,10 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-namei:  
+namei:  libselinux 
 nologin:  
 nsenter:  libselinux 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -113,5 +116,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index fed47bb64af42fb14fb72f093de2f212e87a9e71..a20517cc26a7625f047d05be96c03d20a0abcf6f 100644 (file)
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -90,6 +92,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -113,5 +116,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index d80af4675a11ba59f0621527c29a8e42fd1b17b2..568241341e25f6f1aab235817f90e14b4c56d875 100644 (file)
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 fdformat:  
 flock:  
@@ -89,11 +91,12 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-namei:  
+namei:  libselinux 
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
 pg:  libncursesw libtinfo 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -119,6 +122,7 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 vipw:  libselinux 
+waitpid:  
 wall:  
 whereis:  
 write:  

diff --git a/tests/expected/build-sys/config-devel-non-asan b/tests/expected/build-sys/config-devel-non-asan
index d80af4675a11ba59f0621527c29a8e42fd1b17b2..568241341e25f6f1aab235817f90e14b4c56d875 100644 (file)
--- a/tests/expected/build-sys/config-devel-non-asan
+++ b/tests/expected/build-sys/config-devel-non-asan
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 fdformat:  
 flock:  
@@ -89,11 +91,12 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-namei:  
+namei:  libselinux 
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
 pg:  libncursesw libtinfo 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -119,6 +122,7 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 vipw:  libselinux 
+waitpid:  
 wall:  
 whereis:  
 write:  

diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs
index d80af4675a11ba59f0621527c29a8e42fd1b17b2..568241341e25f6f1aab235817f90e14b4c56d875 100644 (file)
--- a/tests/expected/build-sys/config-devel-non-docs
+++ b/tests/expected/build-sys/config-devel-non-docs
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 fdformat:  
 flock:  
@@ -89,11 +91,12 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-namei:  
+namei:  libselinux 
 newgrp:  libcrypt 
 nologin:  
 nsenter:  libselinux 
 pg:  libncursesw libtinfo 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -119,6 +122,7 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 vipw:  libselinux 
+waitpid:  
 wall:  
 whereis:  
 write:  

diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index bc34d67e6b1fd89872ce4ad8c77f8ff5a2dce81d..ed38eb5c5604e123ed6891fb1f9e518697da3558 100644 (file)
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -24,6 +24,7 @@ wdctl:  libsmartcols
 zramctl:  libsmartcols 
 agetty:  
 blkdiscard:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -38,6 +39,7 @@ colcrt:
 colrm:  
 ctrlaltdel:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -68,6 +70,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -90,5 +93,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 890f7c2f92d8afc5ccaa4662fd5d790779bc65b7..45ff7117598f299f083569beaf589f355e58fc1c 100644 (file)
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -31,6 +31,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -46,6 +47,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -76,6 +78,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -99,5 +102,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index 5bf0e0c9d36dc3993a5cc69e0a41b1bb39530a68..b88a6a1833dc120a319691902879a32d7f3e7869 100644 (file)
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -1,5 +1,6 @@
 agetty:  
 blkdiscard:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -14,6 +15,7 @@ colcrt:
 colrm:  
 ctrlaltdel:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -45,6 +47,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -67,5 +70,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols
index d58ec93c3433f0f0948d9f893cec29f9e067ce48..28ff817b2bf2f7a7c5d5fef37e3d5df8a42ee2c9 100644 (file)
--- a/tests/expected/build-sys/config-non-libsmartcols
+++ b/tests/expected/build-sys/config-non-libsmartcols
@@ -17,6 +17,7 @@ umount:  libmount
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -31,6 +32,7 @@ colcrt:
 colrm:  
 ctrlaltdel:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -61,6 +63,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -83,5 +86,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 77912475c148e6de024c86da09f77e7174b2ff81..3e5a295e4c2c54f4c366db128eca8260c7886b4b 100644 (file)
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -37,6 +37,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -52,6 +53,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -82,6 +84,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -105,5 +108,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index fed47bb64af42fb14fb72f093de2f212e87a9e71..a20517cc26a7625f047d05be96c03d20a0abcf6f 100644 (file)
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -90,6 +92,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -113,5 +116,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index fcb55bda26b7ebd0d78344171b98826efc3d3ba5..4d2e5f84b40cf8cde7e16045bdd77791e7833c6b 100644 (file)
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -87,9 +89,10 @@ mkfs.bfs:
 mkfs.cramfs:  libz 
 mkfs.minix:  
 more:  libtinfo 
-namei:  
+namei:  libselinux 
 nologin:  
 nsenter:  libselinux 
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -113,5 +116,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 8eea3cf1c16c39e0d62b5b34e0b6486bb2c9f2d0..5a3ac996c11916ac818f6be212cc18606c50e7e2 100644 (file)
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -45,6 +45,7 @@ wipefs:  libblkid libsmartcols
 zramctl:  libsmartcols 
 addpart:  
 agetty:  
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -60,6 +61,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 flock:  
 fsck.cramfs:  libz 
@@ -90,6 +92,7 @@ more:  libtinfo
 namei:  
 nologin:  
 nsenter:  
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -113,5 +116,6 @@ uclampset:
 ul:  libtinfo 
 unshare:  
 utmpdump:  
+waitpid:  
 wall:  
 whereis:  

diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index 8d1b4b9b55fb6fbb539c0afec19f24b4b52c6a63..92de9d78f5c5b7b8d25881c216a194a344d95167 100644 (file)
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -46,6 +46,7 @@ zramctl:  libsmartcols
 addpart:  
 agetty:  
 blkid.static: STATIC
+blkpr:  
 blkzone:  
 blockdev:  
 cal:  libtinfo 
@@ -61,6 +62,7 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+fadvise:  
 fallocate:  
 fdisk.static: STATIC
 flock:  
@@ -95,6 +97,7 @@ namei:
 nologin:  
 nsenter:  
 nsenter.static: STATIC
+pipesz:  
 pivot_root:  
 readprofile:  
 rename:  
@@ -121,5 +124,6 @@ umount.static: STATIC
 unshare:  
 unshare.static: STATIC
 utmpdump:  
+waitpid:  
 wall:  
 whereis: