diff options
| author | Karel Zak | 2013-06-25 15:55:02 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-16 16:47:04 +0200 |
| commit | f02fecd19a658c54eb2ef2d5af35c0b46380461b (patch) | |
| tree | f154c2deba5b6b2bc0b7a4fe50a4d7b85643e7a8 /fdisks/fdisk.c | |
| parent | libfdisk: add generic function to set disklabel ID (diff) | |
| download | kernel-qcow2-util-linux-f02fecd19a658c54eb2ef2d5af35c0b46380461b.tar.gz kernel-qcow2-util-linux-f02fecd19a658c54eb2ef2d5af35c0b46380461b.tar.xz kernel-qcow2-util-linux-f02fecd19a658c54eb2ef2d5af35c0b46380461b.zip | |
fdisk: (dos) add dos menu callback
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk.c')
| -rw-r--r-- | fdisks/fdisk.c | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c index ff581ce74..c7fe3b48f 100644 --- a/fdisks/fdisk.c +++ b/fdisks/fdisk.c @@ -161,7 +161,7 @@ int warn_geometry(struct fdisk_context *cxt) return 0; } -static void toggle_dos_compatibility_flag(struct fdisk_context *cxt) +void toggle_dos_compatibility_flag(struct fdisk_context *cxt) { struct fdisk_label *lb = fdisk_context_get_label(cxt, "dos"); int flag; @@ -386,7 +386,6 @@ static void expert_command_prompt(struct fdisk_context *cxt) { char c; - size_t n; assert(cxt); @@ -403,30 +402,14 @@ expert_command_prompt(struct fdisk_context *cxt) * are not yet implemented by menu callbacks. Let's * perform the commands here */ switch (c) { - case 'b': - if (fdisk_is_disklabel(cxt, DOS) && - fdisk_ask_partnum(cxt, &n, FALSE) == 0) - dos_move_begin(cxt, n); - break; case 'd': print_raw(cxt); break; - case 'e': - if (fdisk_is_disklabel(cxt, DOS)) - fdisk_dos_list_extended(cxt); - break; - case 'f': - if (fdisk_is_disklabel(cxt, DOS)) - dos_fix_partition_table_order(cxt); - break; case 'g': /* Deprecated, use 'G' in main menu, just for backward * compatibility only. */ fdisk_create_disklabel(cxt, "sgi"); break; - case 'i': - fdisk_set_disklabel_id(cxt); - break; case 'p': list_table(cxt, 1); break; @@ -551,11 +534,7 @@ static void command_prompt(struct fdisk_context *cxt) * perform the commands here */ switch (c) { case 'a': - if (fdisk_is_disklabel(cxt, DOS) && - fdisk_ask_partnum(cxt, &n, FALSE) == 0) - fdisk_partition_toggle_flag(cxt, n, DOS_FLAG_ACTIVE); - - else if (fdisk_is_disklabel(cxt, SGI) && + if (fdisk_is_disklabel(cxt, SGI) && fdisk_ask_partnum(cxt, &n, FALSE) == 0) fdisk_partition_toggle_flag(cxt, n, SGI_FLAG_BOOT); else @@ -564,22 +543,11 @@ static void command_prompt(struct fdisk_context *cxt) case 'b': if (fdisk_is_disklabel(cxt, SGI)) sgi_set_bootfile(cxt); - else if (fdisk_is_disklabel(cxt, DOS)) { - - struct fdisk_context *bsd; - - bsd = fdisk_new_nested_context(cxt, "bsd"); - if (bsd) - bsd_command_prompt(bsd); - fdisk_free_context(bsd); - } else + else unknown_command(c); break; case 'c': - if (fdisk_is_disklabel(cxt, DOS)) - toggle_dos_compatibility_flag(cxt); - - else if (fdisk_is_disklabel(cxt, SGI) && + if (fdisk_is_disklabel(cxt, SGI) && fdisk_ask_partnum(cxt, &n, FALSE) == 0) fdisk_partition_toggle_flag(cxt, n, SGI_FLAG_SWAP); else |