From: Frank A. Zdarsky <fzdarsky@redhat.com>
Date: Tue, 19 Mar 2019 23:27:22 +0000 (+0100)
Subject: Fix extraction of kernel from ISO
X-Git-Tag: akraino_r1~21
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=9fe89af91d4a9fd82af12545cfe2e92967579599;p=kni%2Finstaller.git

Fix extraction of kernel from ISO

Extraction of vmlinuz and initramfs.img from ISO failed because
newer ISOs store those in /images instead of /. Fixed location.

Change-Id: I6ce246fa0a212b38d72e969d6f53ca2d6556e5dc
---

diff --git a/cmd/images.go b/cmd/images.go
index 2763d2f..bc74143 100644
--- a/cmd/images.go
+++ b/cmd/images.go
@@ -75,7 +75,7 @@ func ExtractIsoFiles(isoPath string, buildPath string) {
 	}
 
 	// copy the images to the build directory
-	cmd = exec.Command("cp", fmt.Sprintf("%s/vmlinuz", mountPath), buildPath)
+	cmd = exec.Command("cp", fmt.Sprintf("%s/images/vmlinuz", mountPath), buildPath)
 	cmd.Dir = buildPath
 	out, err = cmd.CombinedOutput()
 	if err != nil {
@@ -84,7 +84,7 @@ func ExtractIsoFiles(isoPath string, buildPath string) {
 		os.Exit(1)
 	}
 
-	cmd = exec.Command("cp", fmt.Sprintf("%s/initramfs.img", mountPath), buildPath)
+	cmd = exec.Command("cp", fmt.Sprintf("%s/images/initramfs.img", mountPath), buildPath)
 	cmd.Dir = buildPath
 	out, err = cmd.CombinedOutput()
 	if err != nil {