diff options
| author | Karel Zak | 2013-07-12 11:38:05 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-16 16:47:08 +0200 |
| commit | df4bfa97b866452b53f5e2ef433e69a0b732fab6 (patch) | |
| tree | 4b790dbde83267962c13491f9a6643b42790b765 /fdisks/fdisk-menu.c | |
| parent | fdisk: move remaining actions to menu callbacks (diff) | |
| download | kernel-qcow2-util-linux-df4bfa97b866452b53f5e2ef433e69a0b732fab6.tar.gz kernel-qcow2-util-linux-df4bfa97b866452b53f5e2ef433e69a0b732fab6.tar.xz kernel-qcow2-util-linux-df4bfa97b866452b53f5e2ef433e69a0b732fab6.zip | |
fdisk: cleanup write table code
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk-menu.c')
| -rw-r--r-- | fdisks/fdisk-menu.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c index da275fc4b..b28b34cb0 100644 --- a/fdisks/fdisk-menu.c +++ b/fdisks/fdisk-menu.c @@ -406,6 +406,15 @@ static int generic_menu_cb(struct fdisk_context **cxt0, list_disk_geometry(cxt); rc = fdisk_list_disklabel(cxt); break; + case 'w': + rc = fdisk_write_disklabel(cxt); + if (rc) + err(EXIT_FAILURE, _("failed to write disk label")); + if (cxt->parent) + break; /* nested PT, don't leave */ + fdisk_info(cxt, _("The partition table has been altered.")); + reread_partition_table(cxt, 1); + break; case 'q': fdisk_free_context(cxt); printf("\n"); @@ -413,9 +422,6 @@ static int generic_menu_cb(struct fdisk_context **cxt0, case 'm': rc = print_fdisk_menu(cxt); break; - case 'w': - write_table(cxt); - break; case 'v': rc = fdisk_verify_disklabel(cxt); break; |