summaryrefslogtreecommitdiffstats
path: root/disk-utils/Makemodule.am
diff options
context:
space:
mode:
authorOndrej Oprala2015-02-20 09:41:19 +0100
committerKarel Zak2015-03-27 14:04:44 +0100
commitdda7fe12acff6613f23c67de15905848b7521767 (patch)
tree37aa0891825d69ddef40b030d711fc90d46824ab /disk-utils/Makemodule.am
parentlibfdisk: don't return empty strings from fdisk_partition_to_string() (diff)
downloadkernel-qcow2-util-linux-dda7fe12acff6613f23c67de15905848b7521767.tar.gz
kernel-qcow2-util-linux-dda7fe12acff6613f23c67de15905848b7521767.tar.xz
kernel-qcow2-util-linux-dda7fe12acff6613f23c67de15905848b7521767.zip
cfdisk: provide extra partinfo with "x"
The new 'extra' info provides: * filesystem information from libblkid (TYPE, UUID, LABEL) This feature is based on libblkid ability to probe specified area on the device. It allows to probe for filesystems although the partition devices (e.g. /dev/sda2) does not exist. For example from disk image: # cfdisk /home/archive/fs-images/disk.img * additional information from libfdisk (partition UUID, Name, ...) * mount information from libmount (from fstab or mountinfo) Signed-off-by: Ondrej Oprala <ooprala@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com> Co-Author: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/Makemodule.am')
-rw-r--r--disk-utils/Makemodule.am23
1 files changed, 13 insertions, 10 deletions
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 0cedb966b..3a2b36dd0 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -194,22 +194,25 @@ if BUILD_CFDISK
sbin_PROGRAMS += cfdisk
dist_man_MANS += disk-utils/cfdisk.8
cfdisk_SOURCES = disk-utils/cfdisk.c
-cfdisk_LDADD = $(LDADD) libcommon.la libfdisk.la libtcolors.la
-cfdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir)
-
-if BUILD_LIBUUID
-cfdisk_CFLAGS += -I$(ul_libuuid_incdir)
-cfdisk_LDADD += libuuid.la
-endif
+cfdisk_LDADD = \
+ $(LDADD) \
+ libsmartcols.la \
+ libcommon.la \
+ libfdisk.la \
+ libtcolors.la
+cfdisk_CFLAGS = \
+ $(AM_CFLAGS) \
+ -I$(ul_libfdisk_incdir) \
+ -I$(ul_libsmartcols_incdir)
if BUILD_LIBBLKID
cfdisk_CFLAGS += -I$(ul_libblkid_incdir)
cfdisk_LDADD += libblkid.la
endif
-if BUILD_LIBSMARTCOLS
-cfdisk_CFLAGS += -I$(ul_libsmartcols_incdir)
-cfdisk_LDADD += libsmartcols.la
+if BUILD_LIBMOUNT
+cfdisk_CFLAGS += -I$(ul_libmount_incdir)
+cfdisk_LDADD += libmount.la
endif
if HAVE_SLANG