vz: return err if linuxBootLoader() returns error other than os.ErrNotExist

norio-nomura · norio-nomura · commit 68e4237088df · 2024-09-02T16:02:27.000+09:00
Signed-off-by: Norio Nomura &lt;norio.nomura@gmail.com&gt;
diff --git a/pkg/vz/vm_darwin.go b/pkg/vz/vm_darwin.go
@@ -682,9 +682,11 @@ func getMachineIdentifier(driver *driver.BaseDriver) (*vz.GenericMachineIdentifi
 }
 
 func bootLoader(driver *driver.BaseDriver) (vz.BootLoader, error) {
-	// ignore the error it might be a non-existing kernel file
-	if linuxBootLoder, _ := linuxBootLoader(driver); linuxBootLoder != nil {
+	linuxBootLoder, err := linuxBootLoader(driver)
+	if linuxBootLoder != nil {
 		return linuxBootLoder, nil
+	} else if !errors.Is(err, os.ErrNotExist) {
+		return nil, err
 	}
 
 	efiVariableStore, err := getEFI(driver)

Original file line number	Diff line number	Diff line change
`@@ -682,9 +682,11 @@ func getMachineIdentifier(driver driver.BaseDriver) (vz.GenericMachineIdentifi`
`682`	`682`	`}`
`683`	`683`
`684`	`684`	`func bootLoader(driver *driver.BaseDriver) (vz.BootLoader, error) {`
`685`		`- // ignore the error it might be a non-existing kernel file`
`686`		`- if linuxBootLoder, _ := linuxBootLoader(driver); linuxBootLoder != nil {`
	`685`	`+ linuxBootLoder, err := linuxBootLoader(driver)`
	`686`	`+ if linuxBootLoder != nil {`
`687`	`687`	`return linuxBootLoder, nil`
	`688`	`+ } else if !errors.Is(err, os.ErrNotExist) {`
	`689`	`+ return nil, err`
`688`	`690`	`}`
`689`	`691`
`690`	`692`	`efiVariableStore, err := getEFI(driver)`