diff options
| -rw-r--r-- | fdisks/fdisk-menu.c | 12 | ||||
| -rw-r--r-- | fdisks/fdisk.c | 15 |
2 files changed, 9 insertions, 18 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; diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c index 9427d2fd6..44d397caf 100644 --- a/fdisks/fdisk.c +++ b/fdisks/fdisk.c @@ -232,21 +232,6 @@ void list_disk_geometry(struct fdisk_context *cxt) printf("\n"); } -void write_table(struct fdisk_context *cxt) -{ - int rc; - - rc = fdisk_write_disklabel(cxt); - if (rc) - err(EXIT_FAILURE, _("cannot write disk label")); - if (cxt->parent) - /* nested PT, don't leave */ - return; - - printf(_("The partition table has been altered!\n\n")); - reread_partition_table(cxt, 1); -} - void reread_partition_table(struct fdisk_context *cxt, int leave) { int i; |