diff options
| author | Karel Zak | 2014-06-20 12:07:30 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-06-20 12:07:30 +0200 |
| commit | dd626abdbeac4ce15dbe57c8d92702ac1a64d456 (patch) | |
| tree | d950e76fc7c336d3b98e662d888aa6a591798a06 /disk-utils/cfdisk.c | |
| parent | Merge branch 'master' of https://github.com/nazarov-yuriy/util-linux (diff) | |
| download | kernel-qcow2-util-linux-dd626abdbeac4ce15dbe57c8d92702ac1a64d456.tar.gz kernel-qcow2-util-linux-dd626abdbeac4ce15dbe57c8d92702ac1a64d456.tar.xz kernel-qcow2-util-linux-dd626abdbeac4ce15dbe57c8d92702ac1a64d456.zip | |
cfdisk: don't offer BSD
BSD is nested within DOS partition, so for disk without any partition
table it does not make any sense to offer BSD label.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/cfdisk.c')
| -rw-r--r-- | disk-utils/cfdisk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index bf49cf257..d350dc842 100644 --- a/disk-utils/cfdisk.c +++ b/disk-utils/cfdisk.c @@ -1529,10 +1529,10 @@ static int ui_create_label(struct cfdisk *cf) nitems = fdisk_context_get_nlabels(cf->cxt); cm = xcalloc(nitems + 1, sizeof(struct cfdisk_menuitem)); - for (i = 0; i < nitems; i++) { - if (fdisk_context_next_label(cf->cxt, &lb)) - break; - cm[i].name = lb->name; + while (fdisk_context_next_label(cf->cxt, &lb) == 0) { + if (fdisk_label_is_disabled(lb) || strcmp(lb->name, "bsd") == 0) + continue; + cm[i++].name = lb->name; } erase(); |