diff options
| -rw-r--r-- | partedUtils.py | 7 | ||||
| -rw-r--r-- | partitions.py | 7 | ||||
| -rwxr-xr-x | scripts/mk-images.efi | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/partedUtils.py b/partedUtils.py index bc0c10cad..573bf4c80 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 da4971f22..29c4844ad 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 c36b90bb7..29169752f 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 } |