|
|
|
|
From 64107c0347dde0b7207b31132837864bd5f4c714 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Karel Zak <kzak@redhat.com>
|
|
|
|
|
Date: Wed, 15 Mar 2017 14:16:25 +0100
|
|
|
|
|
Subject: [PATCH 090/116] fdisk: fix menu for GPT
|
|
|
|
|
|
|
|
|
|
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1344720
|
|
|
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
fdisks/fdisk.c | 13 ++++++++-----
|
|
|
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
|
|
|
|
|
index 2656711..0ec9909 100644
|
|
|
|
|
--- a/fdisks/fdisk.c
|
|
|
|
|
+++ b/fdisks/fdisk.c
|
|
|
|
|
@@ -87,18 +87,21 @@ static const struct menulist_descr menulist[] = {
|
|
|
|
|
{'n', N_("add a new partition"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_OSF | FDISK_DISKLABEL_GPT, 0}},
|
|
|
|
|
{'o', N_("change rotation speed (rpm)"), {0, FDISK_DISKLABEL_SUN}},
|
|
|
|
|
{'o', N_("create a new empty DOS partition table"), {~FDISK_DISKLABEL_OSF, 0}},
|
|
|
|
|
- {'p', N_("print the partition table"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_OSF, FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN}},
|
|
|
|
|
+ {'p', N_("print the partition table"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_OSF | FDISK_DISKLABEL_GPT,
|
|
|
|
|
+ FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_GPT }},
|
|
|
|
|
{'q', N_("quit without saving changes"), {FDISK_DISKLABEL_ANY, FDISK_DISKLABEL_ANY}},
|
|
|
|
|
- {'r', N_("return to main menu"), {FDISK_DISKLABEL_OSF, FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_OSF}},
|
|
|
|
|
+ {'r', N_("return to main menu"), {FDISK_DISKLABEL_OSF, FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_OSF | FDISK_DISKLABEL_GPT}},
|
|
|
|
|
{'s', N_("change number of sectors/track"), {0, FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN}},
|
|
|
|
|
{'s', N_("create a new empty Sun disklabel"), {~FDISK_DISKLABEL_OSF, 0}},
|
|
|
|
|
{'s', N_("show complete disklabel"), {FDISK_DISKLABEL_OSF, 0}},
|
|
|
|
|
{'t', N_("change a partition's system id"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_OSF, 0}},
|
|
|
|
|
{'u', N_("change display/entry units"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_OSF, 0}},
|
|
|
|
|
- {'v', N_("verify the partition table"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI, FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI}},
|
|
|
|
|
+ {'v', N_("verify the partition table"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_GPT,
|
|
|
|
|
+ FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_GPT}},
|
|
|
|
|
{'w', N_("write disklabel to disk"), {FDISK_DISKLABEL_OSF, 0}},
|
|
|
|
|
- {'w', N_("write table to disk and exit"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_GPT, FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI}},
|
|
|
|
|
- {'x', N_("extra functionality (experts only)"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI, 0}},
|
|
|
|
|
+ {'w', N_("write table to disk and exit"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_GPT,
|
|
|
|
|
+ FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_GPT}},
|
|
|
|
|
+ {'x', N_("extra functionality (experts only)"), {FDISK_DISKLABEL_DOS | FDISK_DISKLABEL_SUN | FDISK_DISKLABEL_SGI | FDISK_DISKLABEL_GPT, 0}},
|
|
|
|
|
#if !defined (__alpha__)
|
|
|
|
|
{'x', N_("link BSD partition to non-BSD partition"), {FDISK_DISKLABEL_OSF, 0}},
|
|
|
|
|
#endif
|
|
|
|
|
--
|
|
|
|
|
2.9.3
|
|
|
|
|
|
