Merge "Fix centos 8.3 partition image building error with element iscsi-boot"

2021-01-18 06:43:25 +00:00 · 2021-01-18 06:43:25 +00:00 · 3c2d18d33e
commit 3c2d18d33e
parent 45796c65c5 447354f933
1 changed files with 3 additions and 0 deletions
--- a/diskimage_builder/elements/iscsi-boot/finalise.d/51-open-iscsi-config
+++ b/diskimage_builder/elements/iscsi-boot/finalise.d/51-open-iscsi-config
@ -8,6 +8,9 @@ set -eu
 set -o pipefail

 if [[ $DISTRO_NAME =~ "centos" ]]; then
+    if [[ -L /boot/grub2/grubenv ]]; then
+        rm -f /boot/grub2/grubenv
+    fi
    sed -i -E 's/(GRUB_CMDLINE_LINUX_DEFAULT=")(.+)(")/\1\2 rd.iscsi.firmware=1"/' /etc/default/grub
    grub2-mkconfig -o /boot/grub2/grub.cfg
 fi