thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

cfdisk: use fdisk_reread_changes()

Browse source 
Let's make cfdisk usable for disks where some partitions are mounted.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-07-14 11:08:54 +02:00
parent fadd8e0877
commit 044ebc0c93
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
disk-utils/cfdisk.c
View file

@ -212,6 +212,7 @@ struct cfdisk_line {
struct cfdisk { struct cfdisk {
struct fdisk_context *cxt; /* libfdisk context */ struct fdisk_context *cxt; /* libfdisk context */
struct fdisk_table *table; /* partition table */ struct fdisk_table *table; /* partition table */
struct fdisk_table *original_layout; /* original on-disk PT */
struct cfdisk_menu *menu; /* the current menu */ struct cfdisk_menu *menu; /* the current menu */
@ -238,6 +239,7 @@ struct cfdisk {
#endif #endif
unsigned int wrong_order :1, /* PT not in right order */ unsigned int wrong_order :1, /* PT not in right order */
zero_start :1, /* ignore existing partition table */ zero_start :1, /* ignore existing partition table */
device_is_used : 1, /* don't use re-read ioctl */
show_extra :1; /* show extra partinfo */ show_extra :1; /* show extra partinfo */
}; };
@ -2371,7 +2373,10 @@ static int main_menu_action(struct cfdisk *cf, int key)
if (rc) if (rc)
warn = _("Failed to write disklabel."); warn = _("Failed to write disklabel.");
else { else {
fdisk_reread_partition_table(cf->cxt); if (cf->device_is_used)
fdisk_reread_changes(cf->cxt, cf->original_layout);
else
fdisk_reread_partition_table(cf->cxt);
info = _("The partition table has been altered."); info = _("The partition table has been altered.");
} }
cf->nwrites++; cf->nwrites++;
@ -2638,6 +2643,11 @@ int main(int argc, char *argv[])
if (rc != 0) if (rc != 0)
err(EXIT_FAILURE, _("cannot open %s"), diskpath); err(EXIT_FAILURE, _("cannot open %s"), diskpath);
if (!fdisk_is_readonly(cf->cxt)) {
cf->device_is_used = fdisk_device_is_used(cf->cxt);
fdisk_get_partitions(cf->cxt, &cf->original_layout);
}
/* Don't use err(), warn() from this point */ /* Don't use err(), warn() from this point */
ui_init(cf); ui_init(cf);
ui_run(cf); ui_run(cf);