Always return an OsRelease struct, even if /etc/os-release is absent

crc-org · Jan 5, 2021 · 58f6dff · 58f6dff
1 parent 7b098c1
commit 58f6dff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/crc/preflight/preflight_linux.go b/pkg/crc/preflight/preflight_linux.go
@@ -246,8 +246,10 @@ func distroIsLike(osRelease *linux.OsRelease, osType linux.OsType) bool {
 func distro() *linux.OsRelease {
 	distro, err := linux.GetOsRelease()
 	if err != nil {
-		logging.Warnf("cannot get distribution name: %v", err)
-		return nil
+		logging.Errorf("cannot get distribution name: %v", err)
+		return &linux.OsRelease{
+			ID: "unknown",
+		}
 	}
 	return distro
 }
diff --git a/pkg/os/linux/release_info.go b/pkg/os/linux/release_info.go
@@ -102,7 +102,7 @@ func UnmarshalOsRelease(osReleaseContents []byte, release *OsRelease) error {
 func GetOsRelease() (*OsRelease, error) {
 	// Check if release file exist
 	if _, err := os.Stat(releaseFile); os.IsNotExist(err) {
-		return nil, fmt.Errorf("%s not exist", releaseFile)
+		return nil, fmt.Errorf("%s doesn't exist", releaseFile)
 	}
 	content, err := ioutil.ReadFile(releaseFile)
 	if err != nil {