summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0018-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-28 21:06:07 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-28 21:08:04 +0200
commit19f71a90eb7f7419892b6a359647ba29d4ebf739 (patch)
tree91a714379e5e741cb85557b7e293dd436cd3cfca /patches/opnfv-fuel/0018-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch
parent2da79800d8ee9bc4210740255a42f7ec7a65c072 (diff)
p/fuel: UEFI: Rework Ubuntu boot entry cleanup
JIRA: ARMBAND-287 Change-Id: Ib4a5d1c1bebe8fe09696fcb1cb882f42679d6738 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0018-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch')
-rw-r--r--patches/opnfv-fuel/0018-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/patches/opnfv-fuel/0018-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0018-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch
deleted file mode 100644
index 04433182..00000000
--- a/patches/opnfv-fuel/0018-states-maas-rm-Ubuntu-boot-entry-on-EFI-systems.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 24 Aug 2017 04:09:59 +0200
-Subject: [PATCH] states/maas: rm Ubuntu boot entry on EFI systems
-
-On EFI-enabled systems, grub-install from grub-efi-* package
-installs a boot entry named "ubuntu".
-
-MaaS relies on IPMI to set boot order to PXE first; however
-on systems with buggy firmware or without full IPMI support,
-that fails, leading to booting Ubuntu from hard disk instead.
-
-Work around this by clearing any previous Ubuntu boot entry
-from board flash.
-
-NOTE: This only runs against nodes that are online from a
-previous deploy, and already automatically registered with
-the new Salt master node.
-
-Closes: ARMBAND-47
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/config/states/maas | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 9e0093b..4f27984 100755
---- a/mcp/config/states/maas
-+++ b/mcp/config/states/maas
-@@ -44,6 +44,11 @@ function maas_fixup() {
- return 0
- }
-
-+# UEFI: Clean up Ubuntu boot entry if kvm node online from previous deploy
-+salt -C 'kvm* or cmp*' cmd.run "(which efibootmgr > /dev/null 2>&1 && \
-+ efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \
-+ xargs -I{} efibootmgr --delete-bootnum --bootnum {}) || true"
-+
- # MaaS rack/region controller, node commissioning
- salt -C 'mas01*' cmd.run "add-apt-repository ppa:maas/stable"
-