summaryrefslogtreecommitdiffstats
path: root/fdisks/fdisk.c
diff options
context:
space:
mode:
authorKarel Zak2013-05-23 15:55:35 +0200
committerKarel Zak2013-09-16 16:46:56 +0200
commit9f2809033e72e7a24b5d5169b74afa6efbc63330 (patch)
tree6bb3ce8b24738c3c8dd49b5d21f9fef2cedf7461 /fdisks/fdisk.c
parentfdisk: add functions to geometry menu (diff)
downloadkernel-qcow2-util-linux-9f2809033e72e7a24b5d5169b74afa6efbc63330.tar.gz
kernel-qcow2-util-linux-9f2809033e72e7a24b5d5169b74afa6efbc63330.tar.xz
kernel-qcow2-util-linux-9f2809033e72e7a24b5d5169b74afa6efbc63330.zip
fdisk: move sun commands to sun menu callback
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk.c')
-rw-r--r--fdisks/fdisk.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 2ed6bcd17..96cd71958 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -738,10 +738,6 @@ expert_command_prompt(struct fdisk_context *cxt)
* are not yet implemented by menu callbacks. Let's
* perform the commands here */
switch (c) {
- case 'a':
- if (fdisk_is_disklabel(cxt, SUN))
- fdisk_sun_set_alt_cyl(cxt);
- break;
case 'b':
if (fdisk_is_disklabel(cxt, DOS) &&
fdisk_ask_partnum(cxt, &n, FALSE) == 0)
@@ -753,10 +749,7 @@ expert_command_prompt(struct fdisk_context *cxt)
case 'e':
if (fdisk_is_disklabel(cxt, SGI))
sgi_set_xcyl();
- else if (fdisk_is_disklabel(cxt, SUN))
- fdisk_sun_set_xcyl(cxt);
- else
- if (fdisk_is_disklabel(cxt, DOS))
+ else if (fdisk_is_disklabel(cxt, DOS))
dos_list_table_expert(cxt, 1);
break;
case 'f':
@@ -769,15 +762,9 @@ expert_command_prompt(struct fdisk_context *cxt)
fdisk_create_disklabel(cxt, "sgi");
break;
case 'i':
- if (fdisk_is_disklabel(cxt, SUN))
- fdisk_sun_set_ilfact(cxt);
- else if (fdisk_is_disklabel(cxt, DOS))
+ if (fdisk_is_disklabel(cxt, DOS))
dos_set_mbr_id(cxt);
break;
- case 'o':
- if (fdisk_is_disklabel(cxt, SUN))
- fdisk_sun_set_rspeed(cxt);
- break;
case 'p':
list_table(cxt, 1);
break;
@@ -792,10 +779,6 @@ expert_command_prompt(struct fdisk_context *cxt)
case 'w':
write_table(cxt);
break;
- case 'y':
- if (fdisk_is_disklabel(cxt, SUN))
- fdisk_sun_set_pcylcount(cxt);
- break;
}
}
}
@@ -917,10 +900,6 @@ static void command_prompt(struct fdisk_context *cxt)
fdisk_ask_partnum(cxt, &n, FALSE) == 0)
fdisk_partition_toggle_flag(cxt, n, DOS_FLAG_ACTIVE);
- else if (fdisk_is_disklabel(cxt, SUN) &&
- fdisk_ask_partnum(cxt, &n, FALSE) == 0)
- fdisk_partition_toggle_flag(cxt, n, SUN_FLAG_UNMNT);
-
else if (fdisk_is_disklabel(cxt, SGI) &&
fdisk_ask_partnum(cxt, &n, FALSE) == 0)
fdisk_partition_toggle_flag(cxt, n, SGI_FLAG_BOOT);
@@ -944,9 +923,6 @@ static void command_prompt(struct fdisk_context *cxt)
case 'c':
if (fdisk_is_disklabel(cxt, DOS))
toggle_dos_compatibility_flag(cxt);
- else if (fdisk_is_disklabel(cxt, SUN) &&
- fdisk_ask_partnum(cxt, &n, FALSE) == 0)
- fdisk_partition_toggle_flag(cxt, n, SUN_FLAG_RONLY);
else if (fdisk_is_disklabel(cxt, SGI) &&
fdisk_ask_partnum(cxt, &n, FALSE) == 0)