From 5db57cfc469b45ada0162a64d627ce25a3d2431f Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Tue, 1 Jul 2014 21:40:04 +0100 Subject: 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 --- disk-utils/Makemodule.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'disk-utils/Makemodule.am') 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 -- cgit v1.2.3-55-g7522