diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-13 18:09:16 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-13 18:22:00 +0200 |
| commit | c6cfbefc5f9d1318d89d1ca42e71bed0e5e2ccdf (patch) | |
| tree | f298cfbc667908ca28afa1f0879bdf3b5fdb705d /patches | |
| parent | fd5d134116903def30c1c9bfda69edd4580a9643 (diff) | |
Rebase: p/fuel-agent: Update UEFI after ec71a42.
Rebase after upstream change [1]:
"Grub stage1 shall be installed on all of disks"
[1] https://github.com/openstack/fuel-agent/commit/
c71a424b9552c07ef1f8a068bedea9563cbe45c
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/fuel-agent/0005-Add-esp-partition-flag.patch | 10 | ||||
| -rw-r--r-- | patches/fuel-agent/0007-Add-fs-for-efi-partition.patch | 28 |
2 files changed, 19 insertions, 19 deletions
diff --git a/patches/fuel-agent/0005-Add-esp-partition-flag.patch b/patches/fuel-agent/0005-Add-esp-partition-flag.patch index e90b283b..2ecec416 100644 --- a/patches/fuel-agent/0005-Add-esp-partition-flag.patch +++ b/patches/fuel-agent/0005-Add-esp-partition-flag.patch @@ -16,11 +16,11 @@ index c2fef69..0ae81f9 100644 --- a/fuel_agent/drivers/nailgun.py +++ b/fuel_agent/drivers/nailgun.py @@ -324,7 +324,7 @@ class Nailgun(BaseDataDriver): - # uefi partition (for future use) - LOG.debug('Adding UEFI partition on disk %s: size=200' % - disk['name']) -- parted.add_partition(size=200) -+ parted.add_partition(size=200, flags=['esp']) + # uefi partition (for future use) + LOG.debug('Adding UEFI partition on disk %s: size=200' % + disk['name']) +- parted.add_partition(size=200) ++ parted.add_partition(size=200, flags=['esp']) LOG.debug('Looping over all volumes on disk %s' % disk['name']) for volume in disk['volumes']: 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 dbbde129..0fb94215 100644 --- a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch +++ b/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch @@ -35,20 +35,20 @@ index bc532b4..f092865 100644 # 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') -+ self._esp_partition_done = True + 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') ++ self._esp_partition_done = True LOG.debug('Looping over all volumes on disk %s' % disk['name']) for volume in disk['volumes']: |