diff options
| author | Karel Zak <kzak@redhat.com> | 2015-02-10 12:50:33 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2015-02-10 12:50:33 +0100 |
| commit | 941409c066610affd650d5c2d33fa3be415f9b72 (patch) | |
| tree | b377439509df4c70397a3dffa0543eee3cdffa97 /disk-utils/cfdisk.c | |
| parent | 57eae223177a82df97db24d085255b5b4a8d940d (diff) | |
| download | util-linux-941409c066610affd650d5c2d33fa3be415f9b72.tar.gz | |
cfdisk: improve create-label UI
Reported-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/cfdisk.c')
| -rw-r--r-- | disk-utils/cfdisk.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index c861bc0502..aa989ec0d9 100644 --- a/disk-utils/cfdisk.c +++ b/disk-utils/cfdisk.c @@ -1681,6 +1681,7 @@ static int ui_script_read(struct cfdisk *cf) char buf[PATH_MAX] = { 0 }; int rc; + erase(); rc = ui_get_string(cf, _("Enter script file name: "), _("The script file will be applied to in-memory partition table."), buf, sizeof(buf)); @@ -1699,6 +1700,7 @@ static int ui_script_read(struct cfdisk *cf) else rc = 0; + ui_clean_hint(); fdisk_unref_script(sc); return rc; } @@ -1753,7 +1755,7 @@ done: static int ui_create_label(struct cfdisk *cf) { struct cfdisk_menuitem *d, *cm; - int rc = 1; + int rc = 1, refresh_menu = 1; size_t i = 0, nitems; struct fdisk_label *lb = NULL; @@ -1774,20 +1776,24 @@ static int ui_create_label(struct cfdisk *cf) } erase(); - if (!cf->zero_start) - ui_center(ui_lines - 4, - _("Device does not contain a recognized partition table.")); - ui_center(ui_lines - 3, - _("Select a type to create a new label or press 'L' to load script file.")); /* make the new menu active */ menu_push(cf, cm); cf->menu->vertical = 1; menu_set_title(cf->menu, _("Select label type")); - ui_draw_menu(cf); - refresh(); + + if (!cf->zero_start) + ui_info(_("Device does not contain a recognized partition table.")); + do { + if (refresh_menu) { + ui_draw_menu(cf); + ui_hint(_("Select a type to create a new label or press 'L' to load script file.")); + refresh(); + refresh_menu = 0; + } + int key = getch(); if (ui_resize) @@ -1808,12 +1814,10 @@ static int ui_create_label(struct cfdisk *cf) goto done; case 'l': case 'L': - ui_clean_hint(); - ui_clean_info(); - rc = ui_script_read(cf); if (rc == 0) goto done; + refresh_menu = 1; break; } } while (1); |