Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion internal/server/menu.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,30 @@ func (mb *MenuBuilder) Build() string {
var sb strings.Builder

sb.WriteString("#!ipxe\n\n")
sb.WriteString(mb.buildMainMenu())
if mb.hasEnabledImage(mb.nextBootImageID) {
sb.WriteString(fmt.Sprintf("goto iso%d\n\n", mb.nextBootImageID))
} else {
sb.WriteString(mb.buildMainMenu())
}
sb.WriteString(mb.buildGroupMenus())
sb.WriteString(mb.buildImageBootSections())
sb.WriteString(mb.buildFooter())

return sb.String()
}

func (mb *MenuBuilder) hasEnabledImage(id uint) bool {
if id == 0 {
return false
}
for i := range mb.images {
if mb.images[i].ID == id && mb.images[i].Enabled {
return true
}
}
return false
}

func (mb *MenuBuilder) menuTimeoutMs() int {
if mb.theme != nil && mb.theme.MenuTimeout == 0 {
return 0
Expand Down
38 changes: 38 additions & 0 deletions internal/server/menu_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,44 @@ func testMenuBuilder(types map[uint]string) *MenuBuilder {
}
}

func TestBuildNextBootBypassesMenuForGroupedImage(t *testing.T) {
groupID := uint(3)
mb := testMenuBuilder(map[uint]string{7: "kickstart"})
mb.nextBootImageID = 7
mb.images = []models.Image{
{
ID: 7,
Name: "AlmaLinux",
Filename: "almalinux.iso",
Enabled: true,
BootMethod: "kernel",
Distro: "alma",
GroupID: &groupID,
},
}

out := mb.Build()
if !strings.HasPrefix(out, "#!ipxe\n\ngoto iso7\n\n") {
t.Fatalf("expected next boot to jump directly to the image, got:\n%s", out)
}
if !strings.Contains(out, ":iso7\n") {
t.Fatalf("expected next boot image section to be emitted, got:\n%s", out)
}
if strings.Contains(out, ":start\nmenu ") {
t.Fatalf("expected next boot to bypass the interactive menu, got:\n%s", out)
}
}

func TestBuildMissingNextBootFallsBackToMenu(t *testing.T) {
mb := testMenuBuilder(nil)
mb.nextBootImageID = 99

out := mb.Build()
if !strings.Contains(out, ":start\nmenu ") {
t.Fatalf("expected an unavailable next boot image to fall back to the menu, got:\n%s", out)
}
}

func TestBuildKernelBootSectionAutoInstallParams(t *testing.T) {
img := &models.Image{
ID: 7,
Expand Down