diff options
author | 2016-09-06 16:17:19 +0000 | |
---|---|---|
committer | 2016-09-06 16:17:19 +0000 | |
commit | 441caa623edf47dcf8944ed11aa3c193897dcf72 (patch) | |
tree | 8467070b66fbe1f1fdbe267e15a4cf678b8f8354 /patches/fuel-agent/0005-Add-esp-partition-flag.patch | |
parent | dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7 (diff) |
Revert "EFI: Move patches to Fuel@OPNFV, upstream prep"
This reverts commit dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7.
Change-Id: I317e0f6aa7665c28035307149e6e7d42fdf508f3
Diffstat (limited to 'patches/fuel-agent/0005-Add-esp-partition-flag.patch')
-rw-r--r-- | patches/fuel-agent/0005-Add-esp-partition-flag.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/patches/fuel-agent/0005-Add-esp-partition-flag.patch b/patches/fuel-agent/0005-Add-esp-partition-flag.patch new file mode 100644 index 00000000..2ecec416 --- /dev/null +++ b/patches/fuel-agent/0005-Add-esp-partition-flag.patch @@ -0,0 +1,48 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 8 Mar 2016 16:29:39 +0100 +Subject: [PATCH] Add <esp> partition flag. + +Parted flag <esp> (see [1]) will mark EFI system partition, allowing us +to properly format and mount it during do_partitioning deployment phase. + +[1] https://www.gnu.org/software/parted/manual/html_node/set.html +--- + fuel_agent/drivers/nailgun.py | 2 +- + fuel_agent/utils/partition.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py +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']) + + LOG.debug('Looping over all volumes on disk %s' % disk['name']) + for volume in disk['volumes']: +diff --git a/fuel_agent/utils/partition.py b/fuel_agent/utils/partition.py +index acdd0b3..86349d2 100644 +--- a/fuel_agent/utils/partition.py ++++ b/fuel_agent/utils/partition.py +@@ -93,7 +93,7 @@ def set_partition_flag(dev, num, flag, state='on'): + :param dev: A device file, e.g. /dev/sda. + :param num: Partition number + :param flag: Flag name. Must be one of 'bios_grub', 'legacy_boot', +- 'boot', 'raid', 'lvm' ++ 'boot', 'raid', 'lvm', 'esp' + :param state: Desiable flag state. 'on' or 'off'. Default is 'on'. + + :returns: None +@@ -103,7 +103,7 @@ def set_partition_flag(dev, num, flag, state='on'): + # parted supports more flags but we are interested in + # setting only this subset of them. + # not all of these flags are compatible with one another. +- if flag not in ('bios_grub', 'legacy_boot', 'boot', 'raid', 'lvm'): ++ if flag not in ('bios_grub', 'legacy_boot', 'boot', 'raid', 'lvm', 'esp'): + raise errors.WrongPartitionSchemeError( + 'Unsupported partition flag: %s' % flag) + if state not in ('on', 'off'): |