diff options
Diffstat (limited to 'patches/fuel-agent/0007-Add-fs-for-efi-partition.patch')
| -rw-r--r-- | patches/fuel-agent/0007-Add-fs-for-efi-partition.patch | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch b/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch index 573ec133..dbbde129 100644 --- a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch +++ b/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch @@ -3,10 +3,10 @@ Date: Tue, 8 Mar 2016 21:08:55 +0100 Subject: [PATCH] Add fs for efi partition --- - debian/control | 1 + - fuel_agent/drivers/nailgun.py | 4 +++- - specs/fuel-agent.spec | 1 + - 3 files changed, 5 insertions(+), 1 deletion(-) + debian/control | 1 + + fuel_agent/drivers/nailgun.py | 13 ++++++++++--- + specs/fuel-agent.spec | 1 + + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 189dc00..acfda35 100644 @@ -21,17 +21,34 @@ index 189dc00..acfda35 100644 gdisk, genisoimage, diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py -index bc532b4..24d0d64 100644 +index bc532b4..f092865 100644 --- a/fuel_agent/drivers/nailgun.py +++ b/fuel_agent/drivers/nailgun.py -@@ -324,7 +324,9 @@ class Nailgun(BaseDataDriver): - # uefi partition (for future use) - LOG.debug('Adding UEFI partition on disk %s: size=200' % +@@ -81,6 +81,9 @@ class Nailgun(BaseDataDriver): + # was already allocated on first matching volume + # or not + self._boot_partition_done = False ++ # this var states whether ESP partition was already ++ # allocated on the first matching volume or not ++ self._esp_partition_done = False + # this var is used as a flag that /boot fs + # has already been added. we need this to + # get rid of md over all disks for /boot partition. +@@ -321,10 +324,14 @@ class Nailgun(BaseDataDriver): + LOG.debug('Adding bios_grub partition on disk %s: size=24' % + disk['name']) + parted.add_partition(size=24, flags=['bios_grub']) +- # uefi partition (for future use) +- LOG.debug('Adding UEFI partition on disk %s: size=200' % ++ # uefi partition - added only once. ++ if self._is_boot_disk(disk) and not self._esp_partition_done: ++ LOG.debug('Adding UEFI partition on disk %s: size=200' % disk['name']) - parted.add_partition(size=200, flags=['esp']) -+ prt = parted.add_partition(size=200, flags=['esp']) -+ partition_scheme.add_fs(device=prt.name, mount='/boot/efi', -+ fs_type='vfat') ++ prt = parted.add_partition(size=200, flags=['esp']) ++ partition_scheme.add_fs(device=prt.name, mount='/boot/efi', ++ fs_type='vfat') ++ self._esp_partition_done = True LOG.debug('Looping over all volumes on disk %s' % disk['name']) for volume in disk['volumes']: @@ -47,6 +64,3 @@ index a43f693..c2b9b51 100644 Requires: dpkg Requires: qemu-user-static Requires: xz --- -1.9.1 - |