From 58f6dffac4258d1175867ea7629d3c4467ddd7d8 Mon Sep 17 00:00:00 2001
From: Guillaume Rose <gurose@redhat.com>
Date: Tue, 5 Jan 2021 09:15:41 +0100
Subject: [PATCH] Always return an OsRelease struct, even if /etc/os-release is
 absent

---
 pkg/crc/preflight/preflight_linux.go | 6 ++++--
 pkg/os/linux/release_info.go         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/crc/preflight/preflight_linux.go b/pkg/crc/preflight/preflight_linux.go
index c62be47461..1dd5a40afa 100644
--- 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
index bd951be219..ce9a361af4 100644
--- 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 {