From ee0d0d60d32192b17ee5670cf077e028c75ba29a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 8 Nov 2017 02:09:13 +0100 Subject: lib.sh: Cleanup previous /boot/efi contents Some UEFI firmwares insist on scanning removable drives, even when boot entries were deleted from UEFI boot list (board flash). To work around this, remove contents of , so scanning won't identify any valid EFI binaries. Another option would be erasing partition tables, but identifying the underlying disk(s) is more complicated, especially when using LVM/RAID etc. Change-Id: I9949b99b139b1642e3bd8f04de3bd5ef74d1ecc5 Signed-off-by: Alexandru Avadanii (cherry picked from commit a0a93056d5d5c52b739a2bc8fe0e2aaabb962f36) --- mcp/scripts/lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mcp') diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 6b7193b3f..c6d5d26ce 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -41,7 +41,8 @@ function cleanup_uefi { ssh ${SSH_OPTS} "${SSH_SALT}" "sudo 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 + xargs -I{} efibootmgr --delete-bootnum --bootnum {}; \ + rm -rf /boot/efi/*\"" || true } function cleanup_vms { -- cgit 1.2.3-korg