Merge branch 'snapcore:master' into master

canonical · Jan 5, 2022 · 5a72bb6 · 5a72bb6
2 parents b41ad8b + b426a3f
commit 5a72bb6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/spread/qemu.go b/spread/qemu.go
@@ -102,12 +102,15 @@ func systemPath(system *System) string {
 
 func biosPath(biosName string) (string, error) {
 	bios := os.ExpandEnv("$HOME/.spread/qemu/bios/" + biosName + ".img")
-	if info, err := os.Stat(biosName); err == nil && info.Mode().IsRegular() {
+	if info, err := os.Stat(bios); err == nil && info.Mode().IsRegular() {
+		debugf("using local bios file: %v", bios)
 		return bios, nil
 	}
 
 	if p := os.Getenv("SPREAD_QEMU_FALLBACK_BIOS_PATH"); p != "" {
-		return os.ExpandEnv(filepath.Join(p, biosName+".img")), nil
+		fallbackBios := os.ExpandEnv(filepath.Join(p, biosName+".img"))
+		debugf("using fallback bios file: %v", fallbackBios)
+		return fallbackBios, nil
 	}
 
 	switch biosName {