Skip to content
Merged
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
40 changes: 22 additions & 18 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,31 +270,35 @@ func findBootFiles(kernel string) (_ *bootFiles, err error) {
}

info, err := os.Stat(kernel)
if errors.Is(err, os.ErrNotExist) {
// Assume that kernel is a reference to an image.
cache, err := newImageCache()
if err != nil {
return nil, fmt.Errorf("image cache: %w", err)
}

img, err := cache.Acquire(context.Background(), kernel, os.Stdout)
if err != nil {
return nil, fmt.Errorf("retrieve kernel from OCI image: %w", err)
if err == nil {
if info.IsDir() {
return newBootFiles(kernel)
}
defer closeOnError(img)

return newBootFilesFromImage(img)
} else if err != nil {
// Kernel is a file on disk.
return &bootFiles{Kernel: kernel}, nil
} else if !errors.Is(err, os.ErrNotExist) {
// Unexpected error from stat, maybe not allowed to access it?
return nil, err
return nil, fmt.Errorf("stat kernel: %w", err)
} else if first, _, ok := strings.Cut(kernel, "/"); ok && (first == "" || first == "." || first == "..") {
// This can't be a URL, so we don't fall through to treating it
// as an image.
return nil, fmt.Errorf("kernel %q: %w", kernel, os.ErrNotExist)
}

if info.IsDir() {
return newBootFiles(kernel)
// Assume that kernel is a reference to an image.
cache, err := newImageCache()
if err != nil {
return nil, fmt.Errorf("image cache: %w", err)
}

img, err := cache.Acquire(context.Background(), kernel, os.Stdout)
if err != nil {
return nil, fmt.Errorf("retrieve kernel from OCI image: %w", err)
}
defer closeOnError(img)

// Kernel is a file on disk.
return &bootFiles{Kernel: kernel}, nil
return newBootFilesFromImage(img)
}

func findExecutable() (string, error) {
Expand Down