From 818d79246126787347860dfbcf697c38918c02ff Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 27 Jun 2013 10:54:19 +0200 Subject: fdisk: (bsd) cleanup driver initialization - assume DOS partition only for nested BSD (cxt->parent is set) - don't create BSD label in label probe function, require fdisk_create_disklabel() call Signed-off-by: Karel Zak --- fdisks/fdisk-menu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'fdisks/fdisk-menu.c') diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c index 541e00d48..d8e157827 100644 --- a/fdisks/fdisk-menu.c +++ b/fdisks/fdisk-menu.c @@ -295,8 +295,8 @@ static int menu_detect_collisions(struct fdisk_context *cxt) if (r != e) { DBG(FRONTEND, dbgprint("warning: duplicate key '%c'", e->key)); - DBG(FRONTEND, dbgprint(" %s", e->title)); - DBG(FRONTEND, dbgprint(" %s", r->title)); + DBG(FRONTEND, dbgprint(" : %s", e->title)); + DBG(FRONTEND, dbgprint(" : %s", r->title)); abort(); } } @@ -438,7 +438,11 @@ static int dos_menu_cb(struct fdisk_context *cxt, { struct fdisk_context *bsd = fdisk_new_nested_context(cxt, "bsd"); - if (bsd) + if (!bsd) + return -ENOMEM; + if (!fdisk_dev_has_disklabel(bsd)) + rc = fdisk_create_disklabel(bsd, "bsd"); + if (!rc) bsd_command_prompt(bsd); fdisk_free_context(bsd); break; -- cgit v1.2.3-55-g7522