Skip to content

Commit a2f1a2c

Browse files
sbernhardnadjaheitmann
authored andcommitted
[PR] Fixes #36691 - use 'connectefi scsi' by default
(cherry picked from commit f216b6f)
1 parent 8ea157b commit a2f1a2c

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

app/views/unattended/provisioning_templates/snippet/pxegrub2_chainload.erb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ insmod fat
3232
insmod chain
3333

3434
echo "VMWare hosts with QuickBoot feature enabled may not find the local ESP"
35-
echo "partition due to not initializing all the EFI devices. To workaround, upgrade"
36-
echo "to the latest grub2 (*) and uncomment "connectefi scsi" statement in the"
37-
echo "grub2_chainload template."
35+
echo "partition due to not initializing all the EFI devices. To address this,"
36+
echo "use an up-to-date grub2 (*) version and include the "connectefi scsi" statement"
37+
echo "as provided below. If you're using an older grub2 version or"
38+
echo "the "connectefi scsi" option isn't recognized by your grub2, you can omit it."
3839
echo
3940
echo "Virtual or physical hosts using Software RAID for the ESP partition may try"
4041
echo "booting on the Software RAID, which will fail. To workaround, upgrade to the"
@@ -43,7 +44,7 @@ echo "the grub2_chainload template."
4344
echo
4445
echo "(*) grub2-efi-x64-2.02-122.el8 (upstream doesn't have the patches yet)"
4546
echo
46-
#connectefi scsi
47+
connectefi scsi
4748

4849
menuentry 'Chainload Grub2 EFI from ESP' --id local_chain_hd0 {
4950
echo "Chainloading Grub2 EFI from ESP, enabled devices for booting:"

test/unit/foreman/renderer/snapshots/ProvisioningTemplate/PXEGrub2/PXEGrub2_default_local_boot.host4dhcp.snap.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ insmod fat
77
insmod chain
88

99
echo "VMWare hosts with QuickBoot feature enabled may not find the local ESP"
10-
echo "partition due to not initializing all the EFI devices. To workaround, upgrade"
11-
echo "to the latest grub2 (*) and uncomment "connectefi scsi" statement in the"
12-
echo "grub2_chainload template."
10+
echo "partition due to not initializing all the EFI devices. To address this,"
11+
echo "use an up-to-date grub2 (*) version and include the "connectefi scsi" statement"
12+
echo "as provided below. If you're using an older grub2 version or"
13+
echo "the "connectefi scsi" option isn't recognized by your grub2, you can omit it."
1314
echo
1415
echo "Virtual or physical hosts using Software RAID for the ESP partition may try"
1516
echo "booting on the Software RAID, which will fail. To workaround, upgrade to the"
@@ -18,7 +19,7 @@ echo "the grub2_chainload template."
1819
echo
1920
echo "(*) grub2-efi-x64-2.02-122.el8 (upstream doesn't have the patches yet)"
2021
echo
21-
#connectefi scsi
22+
connectefi scsi
2223

2324
menuentry 'Chainload Grub2 EFI from ESP' --id local_chain_hd0 {
2425
echo "Chainloading Grub2 EFI from ESP, enabled devices for booting:"

test/unit/foreman/renderer/snapshots/ProvisioningTemplate/PXEGrub2/PXEGrub2_global_default.host4dhcp.snap.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ insmod fat
2323
insmod chain
2424

2525
echo "VMWare hosts with QuickBoot feature enabled may not find the local ESP"
26-
echo "partition due to not initializing all the EFI devices. To workaround, upgrade"
27-
echo "to the latest grub2 (*) and uncomment "connectefi scsi" statement in the"
28-
echo "grub2_chainload template."
26+
echo "partition due to not initializing all the EFI devices. To address this,"
27+
echo "use an up-to-date grub2 (*) version and include the "connectefi scsi" statement"
28+
echo "as provided below. If you're using an older grub2 version or"
29+
echo "the "connectefi scsi" option isn't recognized by your grub2, you can omit it."
2930
echo
3031
echo "Virtual or physical hosts using Software RAID for the ESP partition may try"
3132
echo "booting on the Software RAID, which will fail. To workaround, upgrade to the"
@@ -34,7 +35,7 @@ echo "the grub2_chainload template."
3435
echo
3536
echo "(*) grub2-efi-x64-2.02-122.el8 (upstream doesn't have the patches yet)"
3637
echo
37-
#connectefi scsi
38+
connectefi scsi
3839

3940
menuentry 'Chainload Grub2 EFI from ESP' --id local_chain_hd0 {
4041
echo "Chainloading Grub2 EFI from ESP, enabled devices for booting:"

test/unit/foreman/renderer/snapshots/ProvisioningTemplate/snippet/pxegrub2_chainload.host4dhcp.snap.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ insmod fat
33
insmod chain
44

55
echo "VMWare hosts with QuickBoot feature enabled may not find the local ESP"
6-
echo "partition due to not initializing all the EFI devices. To workaround, upgrade"
7-
echo "to the latest grub2 (*) and uncomment "connectefi scsi" statement in the"
8-
echo "grub2_chainload template."
6+
echo "partition due to not initializing all the EFI devices. To address this,"
7+
echo "use an up-to-date grub2 (*) version and include the "connectefi scsi" statement"
8+
echo "as provided below. If you're using an older grub2 version or"
9+
echo "the "connectefi scsi" option isn't recognized by your grub2, you can omit it."
910
echo
1011
echo "Virtual or physical hosts using Software RAID for the ESP partition may try"
1112
echo "booting on the Software RAID, which will fail. To workaround, upgrade to the"
@@ -14,7 +15,7 @@ echo "the grub2_chainload template."
1415
echo
1516
echo "(*) grub2-efi-x64-2.02-122.el8 (upstream doesn't have the patches yet)"
1617
echo
17-
#connectefi scsi
18+
connectefi scsi
1819

1920
menuentry 'Chainload Grub2 EFI from ESP' --id local_chain_hd0 {
2021
echo "Chainloading Grub2 EFI from ESP, enabled devices for booting:"

0 commit comments

Comments
 (0)