summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorKarel Zak2015-01-05 12:53:50 +0100
committerKarel Zak2015-01-05 12:53:50 +0100
commit8c9615a99b730e49c5576dc23a1f5c0e7c0ef725 (patch)
treed7375b279048aa820fdf03022ef06c85dee45f39 /disk-utils
parentcfdisk: improve menu clean function (diff)
downloadkernel-qcow2-util-linux-8c9615a99b730e49c5576dc23a1f5c0e7c0ef725.tar.gz
kernel-qcow2-util-linux-8c9615a99b730e49c5576dc23a1f5c0e7c0ef725.tar.xz
kernel-qcow2-util-linux-8c9615a99b730e49c5576dc23a1f5c0e7c0ef725.zip
cfdisk: improve Dump dialog
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/cfdisk.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index ad72334e1..324f56bbf 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1698,16 +1698,20 @@ static int ui_script_write(struct cfdisk *cf)
goto done;
}
+ DBG(UI, ul_debug("writing dump into: '%s'", buf));
f = fopen(buf, "w");
if (!f) {
ui_warn(_("Cannot open: %s"), buf);
+ rc = -errno;
goto done;
}
rc = fdisk_script_write_file(sc, f);
+ if (!rc)
+ ui_info(_("Disk layout successfully dumped."));
+done:
if (rc)
ui_warn(_("Failed to write script %s"), buf);
-done:
if (f)
fclose(f);
fdisk_unref_script(sc);
@@ -1997,14 +2001,7 @@ static int main_menu_action(struct cfdisk *cf, int key)
}
break;
case 'u':
- rc = ui_script_write(cf);
- if (rc == 0)
- info = _("Disk layout successfully dumped.");
- else if (rc != CFDISK_ERR_ESC) {
- refresh();
- sleep(2);
- warn = _("Failed to create script file");
- }
+ ui_script_write(cf);
break;
case 'W': /* Write */
{