diff options
| author | Sami Kerola | 2014-07-01 22:40:04 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-07-22 12:17:20 +0200 |
| commit | 5db57cfc469b45ada0162a64d627ce25a3d2431f (patch) | |
| tree | 23d67c74e1555511670244087243e5d8faf86a2e /disk-utils/Makemodule.am | |
| parent | Merge branch 'rename' of git://github.com/kerolasa/lelux-utiliteetit (diff) | |
| download | kernel-qcow2-util-linux-5db57cfc469b45ada0162a64d627ce25a3d2431f.tar.gz kernel-qcow2-util-linux-5db57cfc469b45ada0162a64d627ce25a3d2431f.tar.xz kernel-qcow2-util-linux-5db57cfc469b45ada0162a64d627ce25a3d2431f.zip | |
swapon: share get_swap_prober() with swaplabel to print uuid and label
The swapon(8) listing was almost complete, apart from label and uuid.
This change moves the code from swaplabel(8) to shared scope to be used
for printouts in other swap commands, such as swapon.
Adding this feature to lsblk(8) was a consideration, but lsblk is not
interested of swapfiles, so the swapon seems like a better option to add
this information.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'disk-utils/Makemodule.am')
| -rw-r--r-- | disk-utils/Makemodule.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index fb3b564cd..c6183f5ca 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -65,10 +65,10 @@ endif # BUILD_MKSWAP if BUILD_SWAPLABEL sbin_PROGRAMS += swaplabel dist_man_MANS += disk-utils/swaplabel.8 -swaplabel_SOURCES = disk-utils/swaplabel.c +swaplabel_SOURCES = disk-utils/swaplabel.c sys-utils/swapon-common.c -swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -swaplabel_LDADD = $(LDADD) libblkid.la libcommon.la +swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libmount_incdir) +swaplabel_LDADD = $(LDADD) libblkid.la libmount.la libcommon.la if BUILD_LIBUUID swaplabel_LDADD += libuuid.la |