smallsolar/postmarketos-mkinitfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bootdeploy: fallback to vmlinuz* kernels when zboot is set (MR 47)

Browse Source 
Some kernel packages (e.g. linux-lts in Alpine) don't ship linux.efi, so
this needs to fallback to "vmlinuz" or else it won't be able to find a
kernel for boot-deploy.
This commit is contained in:
Clayton Craft
2024-01-29 15:22:46 -08:00
parent e2f4e6254f
commit aa60644ed6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/bootdeploy/bootdeploy.go
View File

@@ -95,13 +95,16 @@ func (b *BootDeploy) Run() error {
} }
func getKernelPath(outDir string, zboot bool) ([]string, error) { func getKernelPath(outDir string, zboot bool) ([]string, error) {
kernFile := "vmlinuz*" var kernels []string
if zboot { if zboot {
kernFile = "linux.efi" kernels, _ = filepath.Glob(filepath.Join(outDir, "linux.efi"))
if len(kernels) > 0 {
return kernels, nil
}
// else fallback to vmlinuz* below
} }
var kernels []string kernFile := "vmlinuz*"
kernels, _ = filepath.Glob(filepath.Join(outDir, kernFile)) kernels, _ = filepath.Glob(filepath.Join(outDir, kernFile))
if len(kernels) == 0 { if len(kernels) == 0 {
return nil, errors.New("Unable to find any kernels at " + filepath.Join(outDir, kernFile)) return nil, errors.New("Unable to find any kernels at " + filepath.Join(outDir, kernFile))