From be0726ce5081a062db7534ae76ec1e4fef9e543d Mon Sep 17 00:00:00 2001
From: Nitesh Konkar <niteshkonkar@in.ibm.com>
Date: Mon, 4 Feb 2019 18:01:00 +0530
Subject: [PATCH] runtime: Do not error if only initrd/rootfs image installed

If only initrd or rootfs image is installed,
allow to start Kata Containers without erroring
out.

Fixes:  #1174

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
---
 pkg/katautils/config.go      | 16 ++++++----------
 pkg/katautils/config_test.go |  8 ++++----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkg/katautils/config.go b/pkg/katautils/config.go
index 3acaf75d3..b286ef1fe 100644
--- a/pkg/katautils/config.go
+++ b/pkg/katautils/config.go
@@ -166,7 +166,7 @@ func (h hypervisor) initrd() (string, error) {
 	p := h.Initrd
 
 	if p == "" {
-		return "", nil
+		return "", errors.New("initrd is not set")
 	}
 
 	return ResolvePath(p)
@@ -176,7 +176,7 @@ func (h hypervisor) image() (string, error) {
 	p := h.Image
 
 	if p == "" {
-		return "", nil
+		return "", errors.New("image is not set")
 	}
 
 	return ResolvePath(p)
@@ -340,20 +340,16 @@ func (h hypervisor) guestHookPath() string {
 }
 
 func (h hypervisor) getInitrdAndImage() (initrd string, image string, err error) {
-	if initrd, err = h.initrd(); err != nil {
-		return
-	}
+	initrd, errInitrd := h.initrd()
 
-	if image, err = h.image(); err != nil {
-		return
-	}
+	image, errImage := h.image()
 
 	if image != "" && initrd != "" {
 		return "", "", errors.New("having both an image and an initrd defined in the configuration file is not supported")
 	}
 
-	if image == "" && initrd == "" {
-		return "", "", errors.New("either image or initrd must be defined in the configuration file")
+	if errInitrd != nil && errImage != nil {
+		return "", "", fmt.Errorf("Either initrd or image must be set to a valid path (initrd: %v) (image: %v)", errInitrd, errImage)
 	}
 
 	return
diff --git a/pkg/katautils/config_test.go b/pkg/katautils/config_test.go
index 2f624972b..12bac1597 100644
--- a/pkg/katautils/config_test.go
+++ b/pkg/katautils/config_test.go
@@ -1046,14 +1046,14 @@ func TestHypervisorDefaultsInitrd(t *testing.T) {
 	defaultInitrdPath = testInitrdPath
 	h := hypervisor{}
 	p, err := h.initrd()
-	assert.NoError(err)
+	assert.Error(err)
 	assert.Equal(p, "", "default Image path wrong")
 
 	// test path resolution
 	defaultInitrdPath = testInitrdLinkPath
 	h = hypervisor{}
 	p, err = h.initrd()
-	assert.NoError(err)
+	assert.Error(err)
 	assert.Equal(p, "")
 }
 
@@ -1083,14 +1083,14 @@ func TestHypervisorDefaultsImage(t *testing.T) {
 	defaultImagePath = testImagePath
 	h := hypervisor{}
 	p, err := h.image()
-	assert.NoError(err)
+	assert.Error(err)
 	assert.Equal(p, "", "default Image path wrong")
 
 	// test path resolution
 	defaultImagePath = testImageLinkPath
 	h = hypervisor{}
 	p, err = h.image()
-	assert.NoError(err)
+	assert.Error(err)
 	assert.Equal(p, "")
 }