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 /sys-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 'sys-utils/Makemodule.am')
| -rw-r--r-- | sys-utils/Makemodule.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 68fd03046..4741fed02 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -255,12 +255,18 @@ swapon_SOURCES = \ sys-utils/swapon.c \ sys-utils/swapon-common.c \ sys-utils/swapon-common.h - -swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libsmartcols_incdir) -swapon_LDADD = $(LDADD) libcommon.la libmount.la libsmartcols.la +swapon_CFLAGS = $(AM_CFLAGS) \ + -I$(ul_libblkid_incdir) \ + -I$(ul_libmount_incdir) \ + -I$(ul_libsmartcols_incdir) +swapon_LDADD = $(LDADD) \ + libblkid.la \ + libcommon.la \ + libmount.la \ + libsmartcols.la swapoff_SOURCES = sys-utils/swapoff.c sys-utils/swapon-common.c -swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) +swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir) swapoff_LDADD = $(LDADD) libmount.la endif |