summaryrefslogtreecommitdiffstats
path: root/fdisks/fdisk.c
diff options
context:
space:
mode:
authorKarel Zak2013-04-30 11:57:30 +0200
committerKarel Zak2013-09-16 16:46:53 +0200
commit3c5fb4757fa2ca0e4c30b9ec65ec87af2cc60bcb (patch)
tree1915a4de29b114721dfb11e4d27e7f4cd2017cf5 /fdisks/fdisk.c
parentlibfdisk: (gpt) use lib/tt.c to list partitions (diff)
downloadkernel-qcow2-util-linux-3c5fb4757fa2ca0e4c30b9ec65ec87af2cc60bcb.tar.gz
kernel-qcow2-util-linux-3c5fb4757fa2ca0e4c30b9ec65ec87af2cc60bcb.tar.xz
kernel-qcow2-util-linux-3c5fb4757fa2ca0e4c30b9ec65ec87af2cc60bcb.zip
libfdisk: add list() label operation
... and use it for GPT Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk.c')
-rw-r--r--fdisks/fdisk.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 33049da18..3da40b6a9 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -668,18 +668,14 @@ static void list_table(struct fdisk_context *cxt, int xtra)
list_disk_geometry(cxt);
- if (fdisk_is_disklabel(cxt, GPT)) {
- gpt_list_table(cxt, xtra);
- return;
- }
-
- if (fdisk_is_disklabel(cxt, OSF)) {
+ if (fdisk_is_disklabel(cxt, OSF))
xbsd_print_disklabel(cxt, xtra);
- return;
- }
- if (fdisk_is_disklabel(cxt, DOS))
+ else if (fdisk_is_disklabel(cxt, DOS))
dos_list_table(cxt, xtra);
+ else
+ fdisk_list_disklabel(cxt);
+
}
static void verify(struct fdisk_context *cxt)