summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--disk-utils/cfdisk.813
-rw-r--r--disk-utils/cfdisk.c112
-rw-r--r--disk-utils/fdisk-menu.c4
3 files changed, 125 insertions, 4 deletions
diff --git a/disk-utils/cfdisk.8 b/disk-utils/cfdisk.8
index 0c68af897..ab5175779 100644
--- a/disk-utils/cfdisk.8
+++ b/disk-utils/cfdisk.8
@@ -105,6 +105,19 @@ MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, ZiB and YiB
Quit the program. This will exit the program without writing any data to
the disk.
.TP
+.B l
+Load sfdisk compatible script file and create a new (in-memory) disk label
+according to the script, and then it is possible to modify the
+partition table before you write it to the device.
+.TP
+.B u
+Dump the current in-memory partition table to the sfdisk compatible file.
+to the script file by command 'O'.
+.sp
+The script files are compatible between cfdisk, sfdisk, fdisk and another
+libfdisk applications. For more details see
+.BR sfdisk (8).
+.TP
.B t
Change the partition type. By default, new partitions are created as
.I Linux
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index b7aa9c241..f3e93b220 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -159,6 +159,8 @@ static struct cfdisk_menuitem main_menuitems[] = {
{ 'h', N_("Help"), N_("Print help screen") },
{ 's', N_("Sort"), N_("Fix partitions order") },
{ 'W', N_("Write"), N_("Write partition table to disk (this might destroy data)") },
+ { 'l', N_("Load"), N_("Load disk layout from sfdisk compatible script file") },
+ { 'u', N_("Dump"), N_("Dump partition table to sfdisk compatible script file") },
{ 0, NULL, NULL }
};
@@ -1346,6 +1348,9 @@ static ssize_t ui_get_string(struct cfdisk *cf, const char *prompt,
move(ln, 0);
clrtoeol();
+ move(ln + 1, 0);
+ clrtoeol();
+
if (prompt) {
mvaddstr(ln, cl, (char *) prompt);
cl += mbs_safe_width(prompt);
@@ -1603,6 +1608,76 @@ done:
return t;
}
+static int ui_script_read(struct cfdisk *cf)
+{
+ struct fdisk_script *sc = NULL;
+ char buf[PATH_MAX] = { 0 };
+ int rc;
+
+ rc = ui_get_string(cf, _("Enter script file name: "),
+ _("The script file will be applied to in-memory partition table."),
+ buf, sizeof(buf));
+ if (rc <= 0)
+ return rc;
+
+ rc = -1;
+ errno = 0;
+ sc = fdisk_new_script_from_file(cf->cxt, buf);
+ if (!sc && errno)
+ ui_warn(_("Cannot open: %s"), buf);
+ else if (!sc)
+ ui_warnx(_("Failed to parse script file %s"), buf);
+ else if (fdisk_apply_script(cf->cxt, sc) != 0)
+ ui_warnx(_("Failed to apply script %s"), buf);
+ else
+ rc = 0;
+
+ fdisk_unref_script(sc);
+ return rc;
+}
+
+static int ui_script_write(struct cfdisk *cf)
+{
+ struct fdisk_script *sc = NULL;
+ char buf[PATH_MAX] = { 0 };
+ FILE *f = NULL;
+ int rc;
+
+ rc = ui_get_string(cf, _("Enter script file name: "),
+ _("The current in-memory partition table will be dumped to the file."),
+ buf, sizeof(buf));
+ if (rc <= 0)
+ return rc;
+
+ rc = 0;
+ sc = fdisk_new_script(cf->cxt);
+ if (!sc) {
+ ui_warn(_("Failed to allocate script handler"));
+ goto done;
+ }
+
+ rc = fdisk_script_read_context(sc, NULL);
+ if (rc) {
+ ui_warnx(_("Failed to read disk layout into script."));
+ goto done;
+ }
+
+ f = fopen(buf, "w");
+ if (!f) {
+ ui_warn(_("Cannot open: %s"), buf);
+ goto done;
+ }
+
+ rc = fdisk_script_write_file(sc, f);
+ if (rc)
+ ui_warn(_("Failed to write script %s"), buf);
+done:
+ if (f)
+ fclose(f);
+ fdisk_unref_script(sc);
+ return rc;
+}
+
/* prints menu with libfdisk labels and waits for users response */
static int ui_create_label(struct cfdisk *cf)
{
@@ -1631,7 +1706,7 @@ static int ui_create_label(struct cfdisk *cf)
ui_center(ui_lines - 4,
_("Device does not contain a recognized partition table."));
ui_center(ui_lines - 3,
- _("Please, select a type to create a new disk label."));
+ _("Select a type to create a new label or press 'L' to load script file."));
/* make the new menu active */
menu_push(cf, cm);
@@ -1659,6 +1734,14 @@ static int ui_create_label(struct cfdisk *cf)
case 'q':
case 'Q':
goto done;
+ case 'L':
+ ui_clean_hint();
+ ui_clean_info();
+
+ rc = ui_script_read(cf);
+ if (rc == 0)
+ goto done;
+ break;
}
} while (1);
@@ -1669,6 +1752,7 @@ done:
return rc;
}
+
static int ui_help(void)
{
size_t i;
@@ -1687,10 +1771,12 @@ static int ui_help(void)
N_(" b Toggle bootable flag of the current partition"),
N_(" d Delete the current partition"),
N_(" h Print this screen"),
+ N_(" l Load disk layout from sfdisk compatible script file"),
N_(" n Create new partition from free space"),
N_(" q Quit program without writing partition table"),
N_(" t Change the partition type"),
N_(" s Fix partitions order (only when in disarray)"),
+ N_(" u Dump disk layout to sfdisk compatible script file"),
N_(" W Write partition table to disk (must enter upper case W)"),
N_(" Since this might destroy data on the disk, you must"),
N_(" either confirm or deny the write by entering `yes' or"),
@@ -1867,6 +1953,27 @@ static int main_menu_action(struct cfdisk *cf, int key)
ref = 1;
}
break;
+ case 'l':
+ rc = ui_script_read(cf);
+ if (rc == 0) {
+ info = _("Script file successfully applied.");
+ ref = 1;
+ } else if (rc != CFDISK_ERR_ESC) {
+ refresh();
+ sleep(2);
+ warn = _("Failed to read script file");
+ }
+ 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");
+ }
+ break;
case 'W': /* Write */
{
char buf[64] = { 0 };
@@ -1906,7 +2013,8 @@ static int main_menu_action(struct cfdisk *cf, int key)
if (ref) {
lines_refresh(cf);
ui_refresh(cf);
- }
+ } else
+ ui_draw_menu(cf);
ui_clean_hint();
if (warn)
diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index 83a3f9406..bea6ab357 100644
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -110,8 +110,8 @@ struct menu menu_generic = {
MENU_ENT_E('x', N_("extra functionality (experts only)"), FDISK_DISKLABEL_BSD),
MENU_SEP(N_("Script")),
- MENU_ENT ('I', N_("read disk layout from fdisk script file")),
- MENU_ENT ('O', N_("write disk layout to fdisk script file")),
+ MENU_ENT ('I', N_("load disk layout from fdisk script file")),
+ MENU_ENT ('O', N_("dump disk layout to fdisk script file")),
MENU_BSEP(N_("Save & Exit")),
MENU_ENT_E('w', N_("write table to disk and exit"), FDISK_DISKLABEL_BSD),
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-06-02 00:41:29 +0200