From 767f08b9d93886ad80ba32c31df8204f42af771b Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 13 Sep 2018 15:51:43 +0200
Subject: [PATCH] clonedisk.sh: fix efibootmgr installation

---
 clonedisk.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/clonedisk.sh b/clonedisk.sh
index 8e17615..f611103 100755
--- a/clonedisk.sh
+++ b/clonedisk.sh
@@ -167,11 +167,14 @@ rmdir boot
 
 if ! [[ $UPDATE ]]; then
     for i in FED1 FED2 FED3 FED4; do
-        efibootmgr -B -b $i
+        efibootmgr -B -b $i || :
     done
     efibootmgr -C -b FED1 -d ${OUT_DEV} -p 1 -L "FedoraBook 1" -l '\efi\fedorabook\1.efi'
     efibootmgr -C -b FED2 -d ${OUT_DEV} -p 1 -L "FedoraBook 2" -l '\efi\fedorabook\2.efi'
     efibootmgr -C -b FED3 -d ${OUT_DEV} -p 1 -L "FedoraBook Old 1" -l '\efi\fedorabook\_1.efi'
     efibootmgr -C -b FED4 -d ${OUT_DEV} -p 1 -L "FedoraBook Old 2" -l '\efi\fedorabook\_2.efi'
-    efibootmgr -o "FED1,FED2,FED3,FED4,$BOOT_ORDER"
+    BOOT_ORDER=$(efibootmgr | grep BootOrder: | { read _ a; echo "$a"; })
+    if ! [[ $BOOT_ORDER == *FED1* ]]; then
+        efibootmgr -o "FED1,FED2,FED3,FED4,$BOOT_ORDER"
+    fi
 fi