fix: uefi bootorder setting

Drop setting UEFI bootorder.

Signed-off-by: Noel Georgi <git@frezbo.dev>

Author: frezbo

hack/release.toml

@@ -179,6 +179,14 @@ When set to `disk`, a full block device is used for the volume.
 
 When `volumeType = "disk"`:
 - Size specific settings are not allowed in the provisioning block (`minSize`, `maxSize`, `grow`).
+"""
+
+    [notes.uefi-boot]
+        title = "UEFI Boot"
+        description = """\
+When using UEFI boot with systemd-boot as bootloader (on new installs of Talos from 1.10+ onwards), Talos will now not touch the UEFI boot order.
+Talos 1.11 made a fix to create UEFI boot entry and set the boot order as first entry, but this behavior caused issues on some systems.
+To avoid further issues, Talos will now only create the UEFI boot entry if it does not exist, but will not modify the boot order.
 """
 
 [make_deps]

internal/app/machined/pkg/runtime/v1alpha1/bootloader/sdboot/efivars.go

@@ -158,18 +158,6 @@ func CreateBootEntry(rw efivarfs.ReadWriter, blkidInfo *blkid.Info, printf func(
 	// but UEFI firmware settings can set a different boot order on boot, which lead to multiple Talos Linux UKI entries in the boot order,
 	// causing some UEFI firmwares to fail to boot at all.
 	// See https://github.com/siderolabs/talos/issues/11829
-	//
-	// So we remove any existing Talos Linux UKI entries from the boot order
-	// making sure the BootOrder only contains non Talos entries.
-	bootOrderUnique := efivarfs.UniqueBootOrder(bootOrder)
-
-	for _, idx := range existingTalosBootEntryIndexes {
-		bootOrderUnique = slices.DeleteFunc(bootOrderUnique, func(i uint16) bool {
-			return i == uint16(idx)
-		})
-	}
-
-	printf("Updated BootOrder without Talos entries: %v", bootOrderUnique)
 
 	// find the next minimal available index for the new Talos Linux UKI boot entry
 	nextMinimalIndex := -1
@@ -221,26 +209,5 @@ func CreateBootEntry(rw efivarfs.ReadWriter, blkidInfo *blkid.Info, printf func(
 
 	printf("created Talos Linux UKI boot entry at index %d", nextMinimalIndex)
 
-	if len(bootOrder) > 0 && bootOrder[0] == uint16(nextMinimalIndex) && !slices.Contains(bootOrder[1:], uint16(nextMinimalIndex)) {
-		// Talos Linux UKI boot entry is already first in the BootOrder
-		printf("Talos Linux UKI boot entry at index %d is already first in BootOrder: %v", nextMinimalIndex, bootOrder)
-
-		return nil
-	}
-
-	// if we have the new Talos Linux UKI boot entry index in the boot order already, we need to remove it first
-	// to avoid having it twice in the boot order
-	bootOrderUnique = slices.DeleteFunc(bootOrderUnique, func(i uint16) bool {
-		return i == uint16(nextMinimalIndex)
-	})
-
-	bootOrderUnique = slices.Insert(bootOrderUnique, 0, uint16(nextMinimalIndex))
-
-	printf("setting Talos Linux UKI boot entry at index %d as first in BootOrder: %v", nextMinimalIndex, bootOrderUnique)
-
-	if err := efivarfs.SetBootOrder(rw, bootOrderUnique); err != nil {
-		return fmt.Errorf("failed to set BootOrder: %w", err)
-	}
-
 	return nil
 }

internal/app/machined/pkg/runtime/v1alpha1/bootloader/sdboot/efivars_test.go

@@ -73,16 +73,12 @@ func TestSetBootEntry(t *testing.T) {
 		name         string
 		efivarfsMock *efivarfs.Mock
 
-		expectedMessageContains string
-		expectedBootOrder       efivarfs.BootOrder
-		expectedEntries         map[int]string
+		expectedEntries map[int]string
 	}{
 		{
 			name:         "empty efivarfs", // both BootOrder and BootEntries are initially empty
 			efivarfsMock: &efivarfs.Mock{},
 
-			expectedMessageContains: "setting Talos Linux UKI boot entry at index 0 as first in BootOrder: [0]",
-			expectedBootOrder:       efivarfs.BootOrder{0},
 			expectedEntries: map[int]string{
 				0: sdboot.TalosBootEntryDescription,
 			},
@@ -100,8 +96,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "setting Talos Linux UKI boot entry at index 1 as first in BootOrder: [1]",
-			expectedBootOrder:       efivarfs.BootOrder{1},
 			expectedEntries: map[int]string{
 				0: "Default Boot Entry",
 				1: sdboot.TalosBootEntryDescription,
@@ -120,8 +114,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "Talos Linux UKI boot entry at index 0 is already first in BootOrder: [0]",
-			expectedBootOrder:       efivarfs.BootOrder{0},
 			expectedEntries: map[int]string{
 				0: sdboot.TalosBootEntryDescription,
 			},
@@ -143,8 +135,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "setting Talos Linux UKI boot entry at index 1 as first in BootOrder: [1 0]",
-			expectedBootOrder:       efivarfs.BootOrder{1, 0},
 			expectedEntries: map[int]string{
 				0: "Default Boot Entry",
 				1: sdboot.TalosBootEntryDescription,
@@ -167,8 +157,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "Talos Linux UKI boot entry at index 1 is already first in BootOrder: [1]",
-			expectedBootOrder:       efivarfs.BootOrder{1},
 			expectedEntries: map[int]string{
 				0: "Default Boot Entry",
 				1: sdboot.TalosBootEntryDescription,
@@ -195,8 +183,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "Talos Linux UKI boot entry at index 1 is already first in BootOrder: [1 0 3 2]",
-			expectedBootOrder:       efivarfs.BootOrder{1, 0, 3, 2},
 			expectedEntries: map[int]string{
 				0: "Default Boot Entry",
 				1: sdboot.TalosBootEntryDescription,
@@ -224,8 +210,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "setting Talos Linux UKI boot entry at index 1 as first in BootOrder: [1 5 0 3 2]",
-			expectedBootOrder:       efivarfs.BootOrder{1, 5, 0, 3, 2},
 			expectedEntries: map[int]string{
 				0: "Default Boot Entry",
 				1: sdboot.TalosBootEntryDescription,
@@ -245,8 +229,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "setting Talos Linux UKI boot entry at index 0 as first in BootOrder: [0 1 3 2]",
-			expectedBootOrder:       efivarfs.BootOrder{0, 1, 3, 2},
 			expectedEntries: map[int]string{
 				0: sdboot.TalosBootEntryDescription,
 			},
@@ -276,8 +258,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "Removing existing Talos Linux UKI boot entry at index 2",
-			expectedBootOrder:       efivarfs.BootOrder{1},
 			expectedEntries: map[int]string{
 				0: "Default Boot Entry",
 				1: sdboot.TalosBootEntryDescription,
@@ -308,8 +288,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "Removing existing Talos Linux UKI boot entry at index 2",
-			expectedBootOrder:       efivarfs.BootOrder{1, 0},
 			expectedEntries: map[int]string{
 				0: "Default Boot Entry",
 				1: sdboot.TalosBootEntryDescription,
@@ -344,8 +322,6 @@ func TestSetBootEntry(t *testing.T) {
 				},
 			},
 
-			expectedMessageContains: "setting Talos Linux UKI boot entry at index 2 as first in BootOrder: [2 1 0 3]",
-			expectedBootOrder:       efivarfs.BootOrder{2, 1, 0, 3},
 			expectedEntries: map[int]string{
 				0:  "Default Boot Entry",
 				1:  "Default Boot Entry",
@@ -366,13 +342,6 @@ func TestSetBootEntry(t *testing.T) {
 
 			require.NoError(t, sdboot.CreateBootEntry(testData.efivarfsMock, blkidInfo, logger.Printf, "test-entry"))
 
-			bootOrder, err := efivarfs.GetBootOrder(testData.efivarfsMock)
-			require.NoError(t, err)
-
-			require.Contains(t, logger.String(), testData.expectedMessageContains, "expected log message not found")
-
-			require.Equal(t, testData.expectedBootOrder, bootOrder, "BootOrder does not match expected value")
-
 			bootEntries, err := efivarfs.ListBootEntries(testData.efivarfsMock)
 			require.NoError(t, err)