Attachment 303817 Details for Bug 444127 – patch to address the issue.

[patch] patch to address the issue.

anaconda-bz444127.patch (text/plain), 3.37 KB, created by Peter Jones on 2008-04-25 19:58:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Jones

Created: 2008-04-25 19:58:28 UTC

Size: 3.37 KB

patch

obsolete

>commit badb2127f59c6b1078674db3269848cf8b4a7a66
>Author: Peter Jones <pjones@redhat.com>
>Date:   Fri Apr 25 15:41:11 2008 -0400
>
>    Don't use size to determine if a partition is an EFI system partition; instead,
>    check that it's not our install image.
>
>diff --git a/partedUtils.py b/partedUtils.py
>index bc0c10c..573bf4c 100644
>--- a/partedUtils.py
>+++ b/partedUtils.py
>@@ -308,12 +308,13 @@ def hasGptLabel(diskset, device):
>     return disk.type.name == "gpt"
> 
> def isEfiSystemPartition(part):
>-    return (part.is_active() and
>-            part.disk.type.name == "gpt" and
>+    if not part.is_active():
>+        return False
>+    return (part.disk.type.name == "gpt" and
>             part.get_name() == "EFI System Partition" and
>             part.get_flag(parted.PARTITION_BOOT) == 1 and
>             part.fs_type.name in ("fat16", "fat32") and
>-            part.geom.length > 81920L) # require at least 40M before we care.
>+            isys.readFSLabel(get_partition_name(part)) != "ANACONDA")
> 
> archLabels = {'i386': ['msdos', 'gpt'],
>               's390': ['dasd', 'msdos'],
>diff --git a/partitions.py b/partitions.py
>index da4971f..29c4844 100644
>--- a/partitions.py
>+++ b/partitions.py
>@@ -1106,10 +1106,11 @@ class Partitions:
> 
>         if iutil.isEfi():
>             bootreq = self.getRequestByMountPoint("/boot/efi")
>-            if (not bootreq) or bootreq.getActualSize(self, diskset) < 50 or \
>-                    bootreq.fstype != fsset.fileSystemTypeGet("efi"):
>+            if (not bootreq) or \
>+                    bootreq.fstype != fsset.fileSystemTypeGet("efi") or \
>+                    bootreq.getActualSize(self, diskset) < 10:
>                 errors.append(_("You must create an EFI System Partition of "
>-                                "type FAT and a size of 50 megabytes."))
>+                                "at least 10 megabytes."))
>         elif rhpl.getArch() in ("i386", "x86_64"):
>             if iutil.isMactel():
>                 # mactel checks
>diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
>index c36b90b..2916975 100755
>--- a/scripts/mk-images.efi
>+++ b/scripts/mk-images.efi
>@@ -123,7 +123,7 @@ prepareEfiImage() {
>     BOOTDISKSIZE=$(du -kcs $MBD_BOOTTREE_TMP | tail -n1 | awk '{print $1}')
>     BOOTDISKSIZE=$(expr $BOOTDISKSIZE + 100)
>     echo "The size of the efiboot.img dosfs is $BOOTDISKSIZE"
>-    mkdosfs -n EFI -C $MBD_FILENAME $BOOTDISKSIZE >/dev/null
>+    mkdosfs -n ANACONDA -C $MBD_FILENAME $BOOTDISKSIZE >/dev/null
>     mount -o loop,shortname=winnt,umask=0077 -t vfat $MBD_FILENAME $MBD_BOOTTREE
>     cp -R $MBD_BOOTTREE_TMP/* $MBD_BOOTTREE
> }
>commit 1ebe2f96dab7a74c121c0d79d2a856e36987d774
>Author: Peter Jones <pjones@redhat.com>
>Date:   Fri Apr 25 15:55:54 2008 -0400
>
>    Label the efi boot filesystem on ia64 as well.
>
>diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
>index 78ad647..df4772f 100644
>--- a/scripts/mk-images.ia64
>+++ b/scripts/mk-images.ia64
>@@ -95,8 +95,7 @@ prepareBootImage() {
> 	BOOTDISKSIZE=$(du -kcs $MBD_BOOTTREE_TMP | tail -n1 | awk '{print $1}')
> 	BOOTDISKSIZE=$(expr $BOOTDISKSIZE + 100)
> 	echo "The size of the boot.img dosfs is $BOOTDISKSIZE"
>-	dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=$MBD_FILENAME 2>/dev/null
>-	mkdosfs -C $MBD_FILENAME $BOOTDISKSIZE >/dev/null
>+	mkdosfs -n ANACONDA -C $MBD_FILENAME $BOOTDISKSIZE >/dev/null
> 	mount -o loop -t vfat $MBD_FILENAME $MBD_BOOTTREE
> 	cp -R $MBD_BOOTTREE_TMP/* $MBD_BOOTTREE
> }

Actions: View | Diff

Attachments on bug 444127: 303762 | 303817