From a57639e1f83149111e9855f3a042630117fe9736 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 12 Jul 2013 11:57:44 +0200 Subject: libfdisk: move sync() and reread PT code from fdisk to libfdisk Signed-off-by: Karel Zak --- fdisks/fdisk-menu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'fdisks/fdisk-menu.c') diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c index b28b34cb0..3a5a57434 100644 --- a/fdisks/fdisk-menu.c +++ b/fdisks/fdisk-menu.c @@ -413,12 +413,14 @@ static int generic_menu_cb(struct fdisk_context **cxt0, if (cxt->parent) break; /* nested PT, don't leave */ fdisk_info(cxt, _("The partition table has been altered.")); - reread_partition_table(cxt, 1); - break; + rc = fdisk_reread_partition_table(cxt); + if (!rc) + rc = fdisk_context_deassign_device(cxt); + /* fallthrough */ case 'q': fdisk_free_context(cxt); - printf("\n"); - exit(EXIT_SUCCESS); + fputc('\n', stdout); + exit(rc == 0 ? EXIT_SUCCESS : EXIT_FAILURE); case 'm': rc = print_fdisk_menu(cxt); break; -- cgit v1.2.3-55-g7522