[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 gnulib                  |    2 +-
 libparted/labels/gpt.c  |   14 ++++++++++++--
 tests/Makefile.am       |    1 +
 tests/t0202-gpt-pmbr.sh |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 3 deletions(-)

New commits:
commit 9c944d92baa1900ad52bbea347ca518db025cfb9
Author: Joel Granados Moreno <jgranado at redhat.com>
Date:   Wed Jun 3 20:36:56 2009 +0200

    tests: ensure that we preserve the first 446 byts of a GPT pmbr
    
    * tests/t0202-gpt-pmbr.sh: Ensure that the first 446 bytes are
    unchanged after creating a GPT partition.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index de09d38..7b532ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ TESTS = \
   t0100-print.sh \
   t0200-gpt.sh \
   t0201-gpt.sh \
+  t0202-gpt-pmbr.sh \
   t1000-mkpartfs.sh \
   t1100-busy-label.sh \
   t1500-small-ext2.sh \
diff --git a/tests/t0202-gpt-pmbr.sh b/tests/t0202-gpt-pmbr.sh
new file mode 100755
index 0000000..2c365c2
--- /dev/null
+++ b/tests/t0202-gpt-pmbr.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+test_description='Preserve first 446B of the Protected MBR for gpt partitions.'
+
+: ${srcdir=.}
+. $srcdir/test-lib.sh
+
+dev=loop-file
+test_expect_success \
+    'Create a 100k test file with random content' \
+    'dd if=/dev/urandom of=$dev bs=1c count=446 &&
+     dd if=/dev/zero of=$dev bs=1c seek=446 count=101954 > /dev/null 2>&1'
+
+test_expect_success \
+    'Extract the first 446 Bytes before GPT creation' \
+    'dd if=$dev of=before bs=1c count=446 > /dev/null 2>&1'
+
+test_expect_success \
+    'create a GPT partition table' \
+    'parted -s $dev mklabel gpt > out 2>&1'
+test_expect_success 'expect no output' 'compare out /dev/null'
+
+test_expect_success \
+    'Extract the first 446 Bytes after GPT creation' \
+    'dd if=$dev of=after bs=1c count=446 > /dev/null 2>&1'
+
+test_expect_success \
+    'Compare the before and after' \
+    'compare before after'
+
+test_done

commit 14a1589194dc0adcebb6cca2ab2c2a87e1d26b38
Author: Joel Granados Moreno <jgranado at redhat.com>
Date:   Wed Jun 3 20:36:55 2009 +0200

    gpt: preserve first 446 bytes of the PMBR (protective MBR)
    
    * libparted/label/gpt.c (_write_pmbr): Make sure we read and preserve
    the first 446 bytes of the device when we are creating the PMBR.

diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index 536e06a..3afc369 100644
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -969,13 +969,23 @@ error:
 }
 
 #ifndef DISCOVER_ONLY
-/* Writes the protective MBR (to keep DOS happy) */
+/* Write the protective MBR (to keep DOS happy) */
 static int
 _write_pmbr (PedDevice * dev)
 {
 	LegacyMBR_t pmbr;
 
-	memset(&pmbr, 0, sizeof(pmbr));
+	/* The UEFI spec is not clear about what to do with the following
+	   elements of the Protective MBR (pmbr): BootCode (0-440B),
+	   UniqueMBRSignature (440B-444B) and Unknown (444B-446B).
+	   With this in mind, we try not to modify these elements.  */
+	if (ped_device_read (dev, &pmbr, 0, GPT_PMBR_SECTORS) < GPT_PMBR_SECTORS)
+		memset (&pmbr, 0, sizeof(pmbr));
+
+	/* Zero out all the legacy partitions.
+	   There are 4 PartitionRecords.  */
+	memset (pmbr.PartitionRecord, 0, sizeof pmbr.PartitionRecord);
+
 	pmbr.Signature = PED_CPU_TO_LE16(MSDOS_MBR_SIGNATURE);
 	pmbr.PartitionRecord[0].OSType      = EFI_PMBR_OSTYPE_EFI;
 	pmbr.PartitionRecord[0].StartSector = 1;

commit 0f9559513a2dee588263a4b78c3b08a24cc69529
Author: Jim Meyering <meyering at redhat.com>
Date:   Wed Jun 17 13:53:47 2009 +0200

    build: update from gnulib
    
    * gnulib: Update submodule to latest.

diff --git a/gnulib b/gnulib
index 61893df..ea5142f 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 61893df315d491846a8b33af7558bf3cca5410dd
+Subproject commit ea5142f7369225f5aef66f89f9b9d1421c6dceff