diff options
| author | Karel Zak | 2013-07-12 11:57:44 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-16 16:47:08 +0200 |
| commit | a57639e1f83149111e9855f3a042630117fe9736 (patch) | |
| tree | 5aa12961088bbab021c3b08a72a12a8a8fd3e83a /fdisks/fdisk-menu.c | |
| parent | fdisk: cleanup write table code (diff) | |
| download | kernel-qcow2-util-linux-a57639e1f83149111e9855f3a042630117fe9736.tar.gz kernel-qcow2-util-linux-a57639e1f83149111e9855f3a042630117fe9736.tar.xz kernel-qcow2-util-linux-a57639e1f83149111e9855f3a042630117fe9736.zip | |
libfdisk: move sync() and reread PT code from fdisk to libfdisk
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk-menu.c')
| -rw-r--r-- | fdisks/fdisk-menu.c | 10 |
1 files changed, 6 insertions, 4 deletions
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; |