use default efi boot path (#211)

metal-stack · Jan 12, 2024 · 302f7d4 · 302f7d4
1 parent f9c5dfd
commit 302f7d4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/cmd/install.go b/cmd/install.go
@@ -583,6 +583,8 @@ GRUB_SERIAL_COMMAND="serial --speed=%s --unit=%s --word=8"`, i.oss.BootloaderID(
 		}
 
 		grubInstallArgs = append(grubInstallArgs, fmt.Sprintf("UUID=%s", i.config.RootUUID))
+	} else {
+		grubInstallArgs = append(grubInstallArgs, "--removable")
 	}
 
 	if i.config.RaidEnabled {
@@ -630,7 +632,6 @@ GRUB_SERIAL_COMMAND="serial --speed=%s --unit=%s --word=8"`, i.oss.BootloaderID(
 				if !found {
 					return fmt.Errorf("unable to process blkid output lines")
 				}
-
 				shim := fmt.Sprintf(`\\EFI\\%s\\grubx64.efi`, i.oss.BootloaderID())
 				if i.oss == osCentos {
 					shim = fmt.Sprintf(`\\EFI\\%s\\shimx64.efi`, i.oss.BootloaderID())

diff --git a/cmd/install_test.go b/cmd/install_test.go
@@ -713,7 +713,7 @@ func Test_installer_grubInstall(t *testing.T) {
 			oss:     osUbuntu,
 			execMocks: []fakeexecparams{
 				{
-					WantCmd:  []string{"grub-install", "--target=x86_64-efi", "--efi-directory=/boot/efi", "--boot-directory=/boot", "--bootloader-id=metal-ubuntu"},
+					WantCmd:  []string{"grub-install", "--target=x86_64-efi", "--efi-directory=/boot/efi", "--boot-directory=/boot", "--bootloader-id=metal-ubuntu", "--removable"},
 					Output:   "",
 					ExitCode: 0,
 				},
@@ -770,7 +770,7 @@ GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=1 --word=8"`,
 					ExitCode: 0,
 				},
 				{
-					WantCmd:  []string{"grub-install", "--target=x86_64-efi", "--efi-directory=/boot/efi", "--boot-directory=/boot", "--bootloader-id=metal-ubuntu", "--no-nvram"},
+					WantCmd:  []string{"grub-install", "--target=x86_64-efi", "--efi-directory=/boot/efi", "--boot-directory=/boot", "--bootloader-id=metal-ubuntu", "--no-nvram", "--removable"},
 					Output:   "",
 					ExitCode: 0,
 				},

diff --git a/debian/docker-make.debian.yaml b/debian/docker-make.debian.yaml
@@ -24,7 +24,7 @@ builds:
       - BASE_OS_VERSION=bookworm
       - DOCKER_APT_CHANNEL=bookworm
       - FRR_VERSION=frr-8
-      - FRR_VERSION_DETAIL=8.5.3-0~deb12u1
+      - FRR_VERSION_DETAIL=8.5.4-0~deb12u1
       - FRR_APT_CHANNEL=bookworm
       - SEMVER_MAJOR_MINOR=12
       - SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}

diff --git a/debian/docker-make.ubuntu.yaml b/debian/docker-make.ubuntu.yaml
@@ -13,7 +13,7 @@ default-build-args:
   - DOCKER_APT_CHANNEL=jammy
   - CRI_VERSION=v1.28.0
   # see https://kernel.ubuntu.com/mainline for available versions
-  - UBUNTU_MAINLINE_KERNEL_VERSION=v6.6.4
+  - UBUNTU_MAINLINE_KERNEL_VERSION=v6.6.10
   - ICE_VERSION=1.12.7
   - ICE_PKG_VERSION=1.3.35.0
 
@@ -26,7 +26,7 @@ builds:
     build-args:
       - BASE_OS_VERSION=22.04
       - FRR_VERSION=frr-8
-      - FRR_VERSION_DETAIL=8.5.3-0~ubuntu22.04.1
+      - FRR_VERSION_DETAIL=8.5.4-0~ubuntu22.04.1
       - FRR_APT_CHANNEL=jammy
       - SEMVER_MAJOR_MINOR=22.04
       - SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}