a248769183
- Summary of important changes from upstream: - add support for a new Linux-specific GPT partition type code - partprobe: remove partitions when there is no partition table - libparted: refactor device-mapper partition sync code - libparted: remove extraneous blkpg add partition ped exception - libparted: don't probe every dm device in probe_all - New Fedora changes: - libparted: Add Intel Rapid Start Technology partition flag. - libparted: Add UEFI System Partition flag. - libparted: Add hfs_esp partition flag to GPT. - libparted: Recognize btrfs filesystem - tests: Add btrfs and xfs to the fs probe test
101 lines
3.0 KiB
Diff
101 lines
3.0 KiB
Diff
From b55724f291fa405f652fbbc5cae6e36cc8a2d200 Mon Sep 17 00:00:00 2001
|
|
From: "Brian C. Lane" <bcl@redhat.com>
|
|
Date: Tue, 20 Mar 2012 17:25:22 -0700
|
|
Subject: [PATCH 02/69] libparted: check PMBR before GPT partition table
|
|
|
|
The UEFI spec requires that a valid GPT disk label have a PMBR
|
|
partition. This moves the PMBR check to before the GPT check,
|
|
exiting gpt_probe with a 0 if the PMBR is not valid.
|
|
|
|
The previous behavior would cause problems in the following situation:
|
|
1. format a disk as GPT
|
|
2. re-format it as MSDOS using tools that don't understand GPT
|
|
|
|
Subsequent operations with parted would then complain about the invalid
|
|
PMBR, but would not allow the disk to be used as an msdos disk. This
|
|
change causes parted to recognize the msdos partition table.
|
|
|
|
* libparted/labels/gpt.c (gpt_probe): Move _pmbr_is_valid test.
|
|
Reported by Chris Murphy in http://bugzilla.redhat.com/805272
|
|
---
|
|
libparted/labels/gpt.c | 47 ++++++++++++++---------------------------------
|
|
1 file changed, 14 insertions(+), 33 deletions(-)
|
|
|
|
diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
|
|
index 84bdc12..91ad71a 100644
|
|
--- a/libparted/labels/gpt.c
|
|
+++ b/libparted/labels/gpt.c
|
|
@@ -457,7 +457,6 @@ _pmbr_is_valid (const LegacyMBR_t *mbr)
|
|
static int
|
|
gpt_probe (const PedDevice *dev)
|
|
{
|
|
- GuidPartitionTableHeader_t *gpt = NULL;
|
|
int gpt_sig_found = 0;
|
|
|
|
PED_ASSERT (dev != NULL);
|
|
@@ -465,47 +464,29 @@ gpt_probe (const PedDevice *dev)
|
|
if (dev->length <= 1)
|
|
return 0;
|
|
|
|
+ void *label;
|
|
+ if (!ptt_read_sector (dev, 0, &label))
|
|
+ return 0;
|
|
+
|
|
+ if (!_pmbr_is_valid (label))
|
|
+ {
|
|
+ free (label);
|
|
+ return 0;
|
|
+ }
|
|
+ free (label);
|
|
+
|
|
void *pth_raw = ped_malloc (pth_get_size (dev));
|
|
if (ped_device_read (dev, pth_raw, 1, GPT_HEADER_SECTORS)
|
|
|| ped_device_read (dev, pth_raw, dev->length - 1, GPT_HEADER_SECTORS))
|
|
{
|
|
- gpt = pth_new_from_raw (dev, pth_raw);
|
|
+ GuidPartitionTableHeader_t *gpt = pth_new_from_raw (dev, pth_raw);
|
|
if (gpt->Signature == PED_CPU_TO_LE64 (GPT_HEADER_SIGNATURE))
|
|
gpt_sig_found = 1;
|
|
+ pth_free (gpt);
|
|
}
|
|
-
|
|
free (pth_raw);
|
|
|
|
- pth_free (gpt);
|
|
-
|
|
- if (!gpt_sig_found)
|
|
- return 0;
|
|
-
|
|
- void *label;
|
|
- if (!ptt_read_sector (dev, 0, &label))
|
|
- return 0;
|
|
-
|
|
- int ok = 1;
|
|
- if (!_pmbr_is_valid ((const LegacyMBR_t *) label))
|
|
- {
|
|
- int ex_status = ped_exception_throw
|
|
- (PED_EXCEPTION_WARNING,
|
|
- PED_EXCEPTION_YES_NO,
|
|
- _("%s contains GPT signatures, indicating that it has "
|
|
- "a GPT table. However, it does not have a valid "
|
|
- "fake msdos partition table, as it should. Perhaps "
|
|
- "it was corrupted -- possibly by a program that "
|
|
- "doesn't understand GPT partition tables. Or "
|
|
- "perhaps you deleted the GPT table, and are now "
|
|
- "using an msdos partition table. Is this a GPT "
|
|
- "partition table?"),
|
|
- dev->path);
|
|
- if (ex_status == PED_EXCEPTION_NO)
|
|
- ok = 0;
|
|
- }
|
|
-
|
|
- free (label);
|
|
- return ok;
|
|
+ return gpt_sig_found;
|
|
}
|
|
|
|
static PedDisk *
|
|
--
|
|
1.8.3.1
|
|
|