drop efibootmgr

5 files changed, 14 insertions, 8 deletions

diff --git a/CentOS7-efi.sh b/CentOS7-efi.sh
index 59af667..f4d1c6d 100755
--- a/CentOS7-efi.sh
+++ b/CentOS7-efi.sh
@@ -2,7 +2,7 @@
 
 name="centos-7-efi"
 repo="repos/centos-7.repo"
-rpms="grub2-efi shim efibootmgr -dracut-config-rescue dracut-config-generic"
+rpms="grub2-efi shim -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
 tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
@@ -10,7 +10,9 @@ img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.qcow2"
 
 echo ""
 echo "###"
-echo "### $name"
+echo "### $name ($arch)"
+echo "###"
+echo "### $rpms"
 echo "###"
 
 set -ex
diff --git a/Fedora-efi-grub2.sh b/Fedora-efi-grub2.sh
index 9970975..6e26824 100755
--- a/Fedora-efi-grub2.sh
+++ b/Fedora-efi-grub2.sh
@@ -3,7 +3,7 @@
 vers="${1-29}"
 name="fedora-${vers}-efi-grub2"
 repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
-rpms="efibootmgr -grubby -dracut-config-rescue dracut-config-generic"
+rpms="-grubby -dracut-config-rescue dracut-config-generic"
 
 rpms_i686="grub2-efi-ia32 grub2-pc"
 rpms_x86_64="shim grub2-efi-x64 grub2-pc"
diff --git a/Fedora-efi-systemd.sh b/Fedora-efi-systemd.sh
index b739a90..490c9b5 100755
--- a/Fedora-efi-systemd.sh
+++ b/Fedora-efi-systemd.sh
@@ -3,7 +3,7 @@
 vers="${1-29}"
 name="fedora-${vers}-efi-systemd"
 repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
-rpms="efibootmgr -grubby -dracut-config-rescue dracut-config-generic"
+rpms="-grubby -dracut-config-rescue dracut-config-generic"
 
 rpms_i686="grub2-pc"
 rpms_x86_64="grub2-pc"
diff --git a/RHEL7-efi.sh b/RHEL7-efi.sh
index 0d41b01..416b890 100755
--- a/RHEL7-efi.sh
+++ b/RHEL7-efi.sh
@@ -3,7 +3,7 @@
 vers="$1"
 name="rhel-${vers}-efi"
 repo="/mort/mirror/rhel/repo/el7/spunk-RHEL-${vers}-Server.repo"
-rpms="grub2-efi shim efibootmgr -dracut-config-rescue dracut-config-generic"
+rpms="grub2-efi shim -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
 tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
@@ -11,7 +11,9 @@ img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.qcow2"
 
 echo ""
 echo "###"
-echo "### $name"
+echo "### $name ($arch)"
+echo "###"
+echo "### $rpms"
 echo "###"
 
 set -ex
diff --git a/RHEL8-efi.sh b/RHEL8-efi.sh
index 45daec7..f75d9c5 100755
--- a/RHEL8-efi.sh
+++ b/RHEL8-efi.sh
@@ -3,7 +3,7 @@
 vers="$1"
 name="rhel-${vers}-efi"
 repo="/mort/mirror/rhel/repo/el8/spunk-RHEL-${vers}-BaseOS.repo"
-rpms="grub2-efi grub2-pc shim efibootmgr -grubby -dracut-config-rescue dracut-config-generic"
+rpms="grub2-efi grub2-pc shim -grubby -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
 tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
@@ -11,7 +11,9 @@ img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.qcow2"
 
 echo ""
 echo "###"
-echo "### $name"
+echo "### $name ($arch)"
+echo "###"
+echo "### $rpms"
 echo "###"
 
 set -ex