diff options
author | 2016-04-17 18:05:24 +0200 | |
---|---|---|
committer | 2016-05-02 14:30:06 +0000 | |
commit | 2a46ded22475e1531a3298ee89b52bd0cc2e0964 (patch) | |
tree | c7bf5a5134da6c1ea100958127f2e0e0d54bc3a5 /patches/fuel-agent/0006-Add-esp-partition-flag.patch | |
parent | 1923e97ad0156b9211f76e47a31298484763fddb (diff) |
target Ubuntu: Blacklist rtc-efi if not supported.
Older ThunderX and possibly other UEFI-enabled targets do not support
rtc-efi properly, so they end up filling dmesg with useless
complaints about not being able to read system time.
This adds a simple test for rtc-efi and blacklists it in target OS
(Ubuntu) if not supported.
While we're at it, rename a patch file I missed in a previous rebase
and update TODO.
Change-Id: Ia86b27ad50aca9b0fde50522f2bd15d329726f34
(cherry picked from commit 6bef7de313b6bb33f7a716d1d70ec4eb4aae9a3f)
Diffstat (limited to 'patches/fuel-agent/0006-Add-esp-partition-flag.patch')
-rw-r--r-- | patches/fuel-agent/0006-Add-esp-partition-flag.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/patches/fuel-agent/0006-Add-esp-partition-flag.patch b/patches/fuel-agent/0006-Add-esp-partition-flag.patch deleted file mode 100644 index a1990565..00000000 --- a/patches/fuel-agent/0006-Add-esp-partition-flag.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 3807ca7..bc532b4 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'): |