diff options
| author | Karel Zak | 2013-09-17 15:58:09 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-17 15:58:09 +0200 |
| commit | b572966747ab6b51783c70982840acefb6e6f178 (patch) | |
| tree | 13bfbcbf69982cf303555258463024fea183f43b /fdisks/fdisk-menu.c | |
| parent | libfdisk: update test_ranges() code (diff) | |
| download | kernel-qcow2-util-linux-b572966747ab6b51783c70982840acefb6e6f178.tar.gz kernel-qcow2-util-linux-b572966747ab6b51783c70982840acefb6e6f178.tar.xz kernel-qcow2-util-linux-b572966747ab6b51783c70982840acefb6e6f178.zip | |
fdisk: fix 'r' in BSD menu
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk-menu.c')
| -rw-r--r-- | fdisks/fdisk-menu.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c index 725130724..d842b8138 100644 --- a/fdisks/fdisk-menu.c +++ b/fdisks/fdisk-menu.c @@ -108,6 +108,7 @@ struct menu menu_generic = { MENU_ENT_L('w', N_("write table to disk"), FDISK_DISKLABEL_BSD), MENU_BENT ('q', N_("quit without saving changes")), MENU_XENT ('r', N_("return to main menu")), + MENU_ENT_L('r', N_("return to main menu"), FDISK_DISKLABEL_BSD), { 0, NULL } } @@ -483,16 +484,13 @@ static int generic_menu_cb(struct fdisk_context **cxt0, case 'r': /* return from nested PT (e.g. BSD) */ if (cxt->parent) { - struct fdisk_context *tmp = cxt->parent; + *cxt0 = cxt->parent; fdisk_info(cxt, _("Leaving nested disk label.")); fdisk_free_context(cxt); - cxt = tmp; + cxt = *cxt0; } break; - default: - fdisk_warnx(cxt, _("%c: unimplemented command"), ent->key); - break; } return rc; |