tests: update build-sys tests

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

13 files changed, 1198 insertions, 1018 deletions

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index f81b5bfaa..2dd77d6c6 100644
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -1,128 +1,156 @@
-mkswap:  libblkid libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-elvtune:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-fdisk.static: STATIC
-sfdisk:  
-sfdisk.static: STATIC
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-chfn:  libpam libpam_misc 
-chsh:  libpam libpam_misc 
-last:  
-login:  libpam libpam_misc 
-newgrp:  rypt 
-test_islocal:  
-test_logindefs:  
-vipw:  
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libudev libuuid 
+mkswap:  libblkid libuuid 
+mount:  libblkid libmount libuuid 
+mountpoint:  libblkid libmount libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libuuid 
+swapon:  libblkid libmount libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
-blkid.static: STATIC
-cal:  libncursesw libtinfo 
-ddate:  
-kill:  
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libuuid 
-umount:  libblkid libuuid 
-mount.static: STATIC
-mtab_lock_test:  
-umount.static: STATIC
-partx:  libblkid libuuid 
 addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libuuid 
-swapon:  libblkid libuuid 
+agetty:  
 arch:  
+blkid.static: STATIC
+blockdev:  
+cal:  libncursesw libtinfo 
 chcpu:  
+chfn:  libpam libpam_misc 
+chrt:  
+chsh:  libpam libpam_misc 
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+ddate:  
+delpart:  
 dmesg:  
+elvtune:  
 fallocate:  
+fdformat:  
+fdisk.static: STATIC
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
+last:  
 ldattach:  
+line:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 losetup:  
 losetup.static: STATIC
 lscpu:  
+lslocks:  
+mcookie:  
+mesg:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+mount.static: STATIC
+namei:  
+newgrp:  rypt 
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
-mesg:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
-write:  
+sfdisk:  
+sfdisk.static: STATIC
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-line:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
+unshare:  
+utmpdump:  
+vipw:  
+wall:  
+wdctl:  
+whereis:  
+write:  
diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index f81b5bfaa..2dd77d6c6 100644
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -1,128 +1,156 @@
-mkswap:  libblkid libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-elvtune:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-fdisk.static: STATIC
-sfdisk:  
-sfdisk.static: STATIC
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-chfn:  libpam libpam_misc 
-chsh:  libpam libpam_misc 
-last:  
-login:  libpam libpam_misc 
-newgrp:  rypt 
-test_islocal:  
-test_logindefs:  
-vipw:  
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libudev libuuid 
+mkswap:  libblkid libuuid 
+mount:  libblkid libmount libuuid 
+mountpoint:  libblkid libmount libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libuuid 
+swapon:  libblkid libmount libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
-blkid.static: STATIC
-cal:  libncursesw libtinfo 
-ddate:  
-kill:  
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libuuid 
-umount:  libblkid libuuid 
-mount.static: STATIC
-mtab_lock_test:  
-umount.static: STATIC
-partx:  libblkid libuuid 
 addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libuuid 
-swapon:  libblkid libuuid 
+agetty:  
 arch:  
+blkid.static: STATIC
+blockdev:  
+cal:  libncursesw libtinfo 
 chcpu:  
+chfn:  libpam libpam_misc 
+chrt:  
+chsh:  libpam libpam_misc 
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+ddate:  
+delpart:  
 dmesg:  
+elvtune:  
 fallocate:  
+fdformat:  
+fdisk.static: STATIC
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
+last:  
 ldattach:  
+line:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 losetup:  
 losetup.static: STATIC
 lscpu:  
+lslocks:  
+mcookie:  
+mesg:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+mount.static: STATIC
+namei:  
+newgrp:  rypt 
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
-mesg:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
-write:  
+sfdisk:  
+sfdisk.static: STATIC
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-line:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
+unshare:  
+utmpdump:  
+vipw:  
+wall:  
+wdctl:  
+whereis:  
+write:  
diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index 15cb9355a..470da5f34 100644
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -1,114 +1,139 @@
-mkswap:  libblkid libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-sfdisk:  
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  libaudit 
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-chfn:  libpam libpam_misc 
-chsh:  libpam libpam_misc 
-login:  libaudit libpam libpam_misc 
-newgrp:  rypt 
-test_islocal:  
-test_logindefs:  
-vipw:  
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libudev libuuid 
+mkswap:  libblkid libuuid 
+mount:  libblkid libmount libuuid 
+mountpoint:  libblkid libmount libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libuuid 
+swapon:  libblkid libmount libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
-cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libuuid 
-umount:  libblkid libuuid 
-mtab_lock_test:  
-partx:  libblkid libuuid 
 addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libuuid 
-swapon:  libblkid libuuid 
+agetty:  
+blockdev:  
+cal:  libncursesw libtinfo 
 chcpu:  
+chrt:  
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+delpart:  
 dmesg:  
 fallocate:  
+fdformat:  
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  libaudit 
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
+logger:  
+login:  libaudit libpam libpam_misc 
+look:  
 losetup:  
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+sfdisk:  
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index 9f441912a..ff1628272 100644
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -1,109 +1,139 @@
-mkswap:  libblkid libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-sfdisk:  
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-test_islocal:  
-test_logindefs:  
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libudev libuuid 
+mkswap:  libblkid libuuid 
+mount:  libblkid libmount libuuid 
+mountpoint:  libblkid libmount libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libuuid 
+swapon:  libblkid libmount libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
-cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libuuid 
-umount:  libblkid libuuid 
-mtab_lock_test:  
-partx:  libblkid libuuid 
 addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libuuid 
-swapon:  libblkid libuuid 
+agetty:  
+blockdev:  
+cal:  libncursesw libtinfo 
 chcpu:  
+chrt:  
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+delpart:  
 dmesg:  
 fallocate:  
+fdformat:  
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 losetup:  
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+sfdisk:  
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index e90fdb4e4..a718ad7f2 100644
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -1,127 +1,156 @@
-mkswap:  libblkid libselinux libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-elvtune:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-fdisk.static: STATIC
-sfdisk:  
-sfdisk.static: STATIC
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  libaudit 
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libselinux libsepol libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-chfn:  libpam libpam_misc libselinux 
-chsh:  libpam libpam_misc libselinux 
-last:  
-login:  libaudit libpam libpam_misc libselinux 
-newgrp:  rypt 
-test_islocal:  
-test_logindefs:  
-vipw:  libselinux 
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libselinux libsepol libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libselinux libsepol libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libselinux libsepol libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libselinux libsepol libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libselinux libsepol libudev libuuid 
+mkswap:  libblkid libselinux libuuid 
+mount:  libblkid libmount libselinux libsepol libuuid 
+mountpoint:  libblkid libmount libselinux libsepol libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libselinux libsepol libuuid 
+swapon:  libblkid libmount libselinux libsepol libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libselinux libsepol libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
-blkid.static: STATIC
-cal:  libncursesw libtinfo 
-ddate:  
-kill:  
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libmount libselinux libsepol libuuid 
-umount:  libblkid libmount libselinux libsepol libuuid 
-mount.static: STATIC
-umount.static: STATIC
-partx:  libblkid libuuid 
 addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libselinux libsepol libuuid 
-swapon:  libblkid libuuid 
+agetty:  
 arch:  
+blkid.static: STATIC
+blockdev:  
+cal:  libncursesw libtinfo 
 chcpu:  
+chfn:  libpam libpam_misc libselinux 
+chrt:  
+chsh:  libpam libpam_misc libselinux 
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+ddate:  
+delpart:  
 dmesg:  
+elvtune:  
 fallocate:  
+fdformat:  
+fdisk.static: STATIC
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  libaudit 
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
+last:  
 ldattach:  
+line:  
+logger:  
+login:  libaudit libpam libpam_misc libselinux 
+look:  
 losetup:  
 losetup.static: STATIC
 lscpu:  
+lslocks:  
+mcookie:  
+mesg:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+mount.static: STATIC
+namei:  
+newgrp:  rypt 
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
-mesg:  
 script:  libutempter libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
-write:  
+sfdisk:  
+sfdisk.static: STATIC
+su:  libpam libpam_misc 
+sulogin:  libselinux rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  libselinux libsepol 
+test_mount_context:  libselinux libsepol 
+test_mount_lock:  libselinux libsepol 
+test_mount_optstr:  libselinux libsepol 
+test_mount_tab:  libselinux libsepol 
+test_mount_tab_diff:  libselinux libsepol 
+test_mount_tab_update:  libselinux libsepol 
+test_mount_utils:  libselinux libsepol 
+test_mount_version:  libselinux libsepol 
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-line:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
+unshare:  
+utmpdump:  
+vipw:  libselinux 
+wall:  
+wdctl:  
+whereis:  
+write:  
diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index bb1d11542..ac6f11b77 100644
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -1,88 +1,88 @@
-mkswap:  libuuid 
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libncursesw libtinfo 
-fdisk:  
-sfdisk:  
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
 libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-test_islocal:  
-test_logindefs:  
+mkswap:  libuuid 
+test_uuid:  libuuid 
 uuidd:  libuuid 
-uuidgen:  libuuid 
+agetty:  
+blockdev:  
 cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-chrt:  
-ionice:  
-taskset:  
+cfdisk:  libncursesw libtinfo 
 chcpu:  
+chrt:  
+col:  
+colcrt:  
 ctrlaltdel:  
 cytune:  
 dmesg:  
 fallocate:  
-flock:  
+fdformat:  
+fdisk:  ld-linux-x86-64 
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
-ipcmk:  
-ipcrm:  
+getopt:  
+hwclock:  
+ionice:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 losetup:  
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+sfdisk:  
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+taskset:  
+test_at:  
+test_blkdev:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 667c8a3a8..2df2303e1 100644
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -1,106 +1,52 @@
-mkswap:  libblkid libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-sfdisk:  
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
 libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-test_islocal:  
-test_logindefs:  
-blkid:  libblkid libuuid 
-findfs:  libblkid libuuid 
-lsblk:  libblkid libudev libuuid 
-uuidd:  libuuid 
-uuidgen:  libuuid 
-wipefs:  libblkid libuuid 
 cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libuuid 
-umount:  libblkid libuuid 
-mtab_lock_test:  
-partx:  libblkid libuuid 
-addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-swapon:  libblkid libuuid 
-chcpu:  
+colcrt:  
 ctrlaltdel:  
 cytune:  
-dmesg:  
 fallocate:  
 flock:  
 fsfreeze:  
-fstrim:  
 ipcmk:  
 ipcrm:  
 ipcs:  
-ldattach:  
-losetup:  
+logger:  
+look:  
 lscpu:  
+mcookie:  
+mkfs:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
-readprofile:  
+raw:  
 renice:  
-rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
+rev:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+su:  libpam libpam_misc 
+switch_root:  
+test_at:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_mangle:  
 test_md5:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_wholedisk:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index cb1d3842c..02d6af65e 100644
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -1,84 +1,72 @@
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-mkswap:  
-raw:  
-cfdisk:  libncursesw libtinfo 
-fdisk:  
-sfdisk:  
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-test_islocal:  
-test_logindefs:  
+agetty:  
 cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-chrt:  
-ionice:  
-taskset:  
-chcpu:  
+colcrt:  
 ctrlaltdel:  
 cytune:  
 dmesg:  
 fallocate:  
+fdformat:  
 flock:  
 fsfreeze:  
 fstrim:  
+getopt:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
-losetup:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+test_at:  
+test_blkdev:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 801320c85..32b0e3ae5 100644
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -1,105 +1,96 @@
-mkswap:  libblkid 
-swaplabel:  libblkid 
+libblkid.so.1.1.0:  ld-linux-x86-64 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid 
+sample-mkfs:  libblkid 
+sample-partitions:  libblkid 
+addpart:  
+agetty:  
 blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo 
-fdisk:  libblkid 
-sfdisk:  
-fsck:  libblkid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid 
-partitions:  libblkid 
-superblocks:  libblkid 
-topology:  libblkid 
-libblkid.so.1.1.0:  
-libmount.so.1.1.0:  libblkid 
-test_islocal:  
-test_logindefs:  
-blkid:  libblkid 
-findfs:  libblkid 
-findmnt:  libblkid libmount 
-lsblk:  libblkid libudev 
-wipefs:  libblkid 
 cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid 
-umount:  libblkid 
-mtab_lock_test:  
-partx:  libblkid 
-addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount 
-swapon:  libblkid 
 chcpu:  
+chrt:  
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+delpart:  
 dmesg:  
 fallocate:  
+fdformat:  
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 losetup:  
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+sfdisk:  
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index 9f441912a..ff1628272 100644
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -1,109 +1,139 @@
-mkswap:  libblkid libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-sfdisk:  
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-test_islocal:  
-test_logindefs:  
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libudev libuuid 
+mkswap:  libblkid libuuid 
+mount:  libblkid libmount libuuid 
+mountpoint:  libblkid libmount libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libuuid 
+swapon:  libblkid libmount libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
-cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libuuid 
-umount:  libblkid libuuid 
-mtab_lock_test:  
-partx:  libblkid libuuid 
 addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libuuid 
-swapon:  libblkid libuuid 
+agetty:  
+blockdev:  
+cal:  libncursesw libtinfo 
 chcpu:  
+chrt:  
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+delpart:  
 dmesg:  
 fallocate:  
+fdformat:  
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 losetup:  
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+sfdisk:  
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index 03bcd9c70..0dfedcce2 100644
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -1,114 +1,139 @@
-mkswap:  libblkid libselinux libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-sfdisk:  
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libselinux libsepol libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-chfn:  libpam libpam_misc libselinux 
-chsh:  libpam libpam_misc libselinux 
-login:  libpam libpam_misc libselinux 
-newgrp:  rypt 
-test_islocal:  
-test_logindefs:  
-vipw:  libselinux 
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libselinux libsepol libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libselinux libsepol libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libselinux libsepol libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libselinux libsepol libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libselinux libsepol libudev libuuid 
+mkswap:  libblkid libselinux libuuid 
+mount:  libblkid libmount libselinux libsepol libuuid 
+mountpoint:  libblkid libmount libselinux libsepol libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libselinux libsepol libuuid 
+swapon:  libblkid libmount libselinux libsepol libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libselinux libsepol libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
-cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libselinux libsepol libuuid 
-umount:  libblkid libuuid 
-mtab_lock_test:  
-partx:  libblkid libuuid 
 addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libselinux libsepol libuuid 
-swapon:  libblkid libuuid 
+agetty:  
+blockdev:  
+cal:  libncursesw libtinfo 
 chcpu:  
+chrt:  
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+delpart:  
 dmesg:  
 fallocate:  
+fdformat:  
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
+logger:  
+login:  libpam libpam_misc libselinux 
+look:  
 losetup:  
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+sfdisk:  
+su:  libpam libpam_misc 
+sulogin:  libselinux rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  libselinux libsepol 
+test_mount_context:  libselinux libsepol 
+test_mount_lock:  libselinux libsepol 
+test_mount_optstr:  libselinux libsepol 
+test_mount_tab:  libselinux libsepol 
+test_mount_tab_diff:  libselinux libsepol 
+test_mount_tab_update:  libselinux libsepol 
+test_mount_utils:  libselinux libsepol 
+test_mount_version:  libselinux libsepol 
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 28042bcd0..9f79db5f9 100644
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -1,109 +1,139 @@
-mkswap:  libblkid libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libslang libuuid 
-fdisk:  libblkid libuuid 
-sfdisk:  
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-test_islocal:  
-test_logindefs:  
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libslang libuuid 
+eject:  libblkid libmount libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libudev libuuid 
+mkswap:  libblkid libuuid 
+mount:  libblkid libmount libuuid 
+mountpoint:  libblkid libmount libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libuuid 
+swapon:  libblkid libmount libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
-cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libuuid 
-umount:  libblkid libuuid 
-mtab_lock_test:  
-partx:  libblkid libuuid 
 addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libuuid 
-swapon:  libblkid libuuid 
+agetty:  
+blockdev:  
+cal:  libncursesw libtinfo 
 chcpu:  
+chrt:  
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+delpart:  
 dmesg:  
 fallocate:  
+fdformat:  
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 losetup:  
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+sfdisk:  
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis:  
diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index e14f4a4d3..bf4c33344 100644
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -1,115 +1,145 @@
-mkswap:  libblkid libuuid 
-swaplabel:  libblkid libuuid 
-blockdev:  
-fdformat:  
-fsck.cramfs:  libz 
-fsck.minix:  
-isosize:  
-mkfs:  
-mkfs.bfs:  
-mkfs.cramfs:  libz 
-mkfs.minix:  
-raw:  
-cfdisk:  libblkid libncursesw libtinfo libuuid 
-fdisk:  libblkid libuuid 
-fdisk.static: STATIC
-sfdisk:  
-sfdisk.static: STATIC
-fsck:  libblkid libuuid 
-getopt:  
-hwclock:  
-test_at:  
-test_blkdev:  
-test_canonicalize:  
-test_cpuset:  
-test_ismounted:  
-test_loopdev:  
-test_mangle:  
-test_procutils:  
-test_strutils:  
-test_sysfs:  
-test_tt:  
-test_wholedisk:  
-mkfs:  libblkid libuuid 
-partitions:  libblkid libuuid 
-superblocks:  libblkid libuuid 
-topology:  libblkid libuuid 
-libblkid.so.1.1.0:  libuuid 
-libmount.so.1.1.0:  libblkid libuuid 
-libuuid.so.1.3.0:  ld-linux-x86-64 
-tst_uuid:  libuuid 
-test_islocal:  
-test_logindefs:  
 blkid:  libblkid libuuid 
+cfdisk:  libblkid libncursesw libtinfo libuuid 
+eject:  libblkid libmount libuuid 
+fdisk:  ld-linux-x86-64 libblkid libuuid 
 findfs:  libblkid libuuid 
 findmnt:  libblkid libmount libuuid 
-lsblk:  libblkid libudev libuuid 
+fsck:  libblkid libmount libuuid 
+libblkid.so.1.1.0:  ld-linux-x86-64 libuuid 
+libmount.so.1.1.0:  ld-linux-x86-64 libblkid libuuid 
+libuuid.so.1.3.0:  ld-linux-x86-64 
+lsblk:  libblkid libmount libudev libuuid 
+mkswap:  libblkid libuuid 
+mount:  libblkid libmount libuuid 
+mountpoint:  libblkid libmount libuuid 
+partx:  libblkid libuuid 
+sample-mkfs:  libblkid libuuid 
+sample-partitions:  libblkid libuuid 
+sample-superblocks:  libblkid libuuid 
+sample-topology:  libblkid libuuid 
+swaplabel:  libblkid libuuid 
+swapoff:  libblkid libmount libuuid 
+swapon:  libblkid libmount libuuid 
+test_uuid:  libuuid 
+umount:  libblkid libmount libuuid 
 uuidd:  libuuid 
 uuidgen:  libuuid 
 wipefs:  libblkid libuuid 
+addpart:  
+agetty:  
 blkid.static: STATIC
+blockdev:  
 cal:  libncursesw libtinfo 
-logger:  
-look:  
-lslocks:  
-mcookie:  
-namei:  
-rename:  
-whereis:  
-mount:  libblkid libuuid 
-umount:  libblkid libuuid 
-mount.static: STATIC
-mtab_lock_test:  
-umount.static: STATIC
-partx:  libblkid libuuid 
-addpart:  
-delpart:  
-chrt:  
-ionice:  
-taskset:  
-mountpoint:  libblkid libmount libuuid 
-swapon:  libblkid libuuid 
 chcpu:  
+chrt:  
+col:  
+colcrt:  
+colrm:  
+column:  
 ctrlaltdel:  
 cytune:  
+delpart:  
 dmesg:  
 fallocate:  
+fdformat:  
+fdisk.static: STATIC
 flock:  
+fsck.cramfs:  libz 
+fsck.minix:  
 fsfreeze:  
 fstrim:  
+getopt:  
+hexdump:  
+hwclock:  
+ionice:  
 ipcmk:  
 ipcrm:  
 ipcs:  
+isosize:  
+kill:  
 ldattach:  
+logger:  
+login:  libpam libpam_misc 
+look:  
 losetup:  
 losetup.static: STATIC
 lscpu:  
+lslocks:  
+mcookie:  
+mkfs:  
+mkfs.bfs:  
+mkfs.cramfs:  libz 
+mkfs.minix:  
+more:  libtinfo 
+mount.static: STATIC
+namei:  
+pg:  libncursesw libtinfo 
 pivot_root:  
 prlimit:  
+raw:  
 readprofile:  
+rename:  
 renice:  
+rev:  
 rtcwake:  
-setarch:  
-setsid:  
-switch_root:  
-tunelp:  
-unshare:  
-agetty:  
 script:  libutil 
 scriptreplay:  
+setarch:  
+setsid:  
 setterm:  libtinfo 
-wall:  
+sfdisk:  
+sfdisk.static: STATIC
+su:  libpam libpam_misc 
+sulogin:  rypt 
+switch_root:  
+tailf:  
+taskset:  
+test_at:  
+test_blkdev:  
+test_blkid_cache:  
+test_blkid_config:  
+test_blkid_dev:  
+test_blkid_devname:  
+test_blkid_devno:  
+test_blkid_evaluate:  
+test_blkid_read:  
+test_blkid_resolve:  
+test_blkid_save:  
+test_blkid_tag:  
+test_blkid_verify:  
 test_byteswap:  
+test_canonicalize:  
+test_cpuset:  
+test_fileutils:  
+test_islocal:  
+test_ismounted:  
+test_logindefs:  
+test_loopdev:  
+test_mangle:  
 test_md5:  
+test_mount_cache:  
+test_mount_context:  
+test_mount_lock:  
+test_mount_optstr:  
+test_mount_tab:  
+test_mount_tab_diff:  
+test_mount_tab_update:  
+test_mount_utils:  
+test_mount_version:  
+test_pager:  
 test_pathnames:  
+test_procutils:  
+test_randutils:  
+test_strutils:  
+test_sysfs:  
 test_sysinfo:  
-col:  
-colcrt:  
-colrm:  
-column:  
-hexdump:  
-more:  libtinfo 
-pg:  libncursesw libtinfo 
-rev:  
-tailf:  
+test_tt:  
+test_wholedisk:  
+tunelp:  
 ul:  libtinfo 
+umount.static: STATIC
+unshare:  
+utmpdump:  
+wall:  
+wdctl:  
+whereis: