From 0ebb6d44243c6599b81452938ce9ca42a432d05c Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 17 Mar 2022 16:57:42 -0700
Subject: [PATCH] simplify life by changing file names

---
 deploy/iso/minikube-iso/board/minikube/aarch64/post-image.sh | 4 ++--
 deploy/iso/minikube-iso/board/minikube/x86_64/grub.cfg       | 4 ++--
 pkg/addons/addons_gcpauth.go                                 | 2 +-
 pkg/drivers/hyperkit/driver.go                               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/post-image.sh b/deploy/iso/minikube-iso/board/minikube/aarch64/post-image.sh
index b3b21c3304..dfda5d8074 100755
--- a/deploy/iso/minikube-iso/board/minikube/aarch64/post-image.sh
+++ b/deploy/iso/minikube-iso/board/minikube/aarch64/post-image.sh
@@ -22,8 +22,8 @@ support/scripts/genimage.sh -c "$GENIMAGE_CFG"
 
 cd "$BINARIES_DIR"
 mkdir -p root/boot
-cp bzImage root/boot/vmlinuz
-cp rootfs.cpio.gz root/boot/initrd.img
+cp bzImage root/boot/bzImage
+cp rootfs.cpio.gz root/boot/initrd
 mkdir -p root/EFI/BOOT
 cp efi-part/EFI/BOOT/* root/EFI/BOOT/
 cp efiboot.img root/EFI/BOOT/
diff --git a/deploy/iso/minikube-iso/board/minikube/x86_64/grub.cfg b/deploy/iso/minikube-iso/board/minikube/x86_64/grub.cfg
index 441c3373c1..009b345539 100644
--- a/deploy/iso/minikube-iso/board/minikube/x86_64/grub.cfg
+++ b/deploy/iso/minikube-iso/board/minikube/x86_64/grub.cfg
@@ -2,6 +2,6 @@ set default="0"
 set timeout="5"
 
 menuentry "Buildroot" {
-  linux /boot/vmlinuz console=tty0 rw # kernel
-  initrd /boot/initrd.img # rootfs
+  linux /boot/bzimage console=tty0 rw # kernel
+  initrd /boot/initrd # rootfs
 }
diff --git a/pkg/addons/addons_gcpauth.go b/pkg/addons/addons_gcpauth.go
index e1b329cbc1..5c8c3ad54a 100644
--- a/pkg/addons/addons_gcpauth.go
+++ b/pkg/addons/addons_gcpauth.go
@@ -98,7 +98,7 @@ func enableAddonGCPAuth(cfg *config.ClusterConfig) error {
 	}
 
 	if creds.JSON == nil {
-		out.WarningT("You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.")
+		out.WarningT("You have authenticated with a service account that does not have an associated JSON. The GCP Auth addon requires credentials with a JSON file to in order to continue. The image pull secret has been imported.")
 		return nil
 	}
 
diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go
index 9a2af4ad1a..f04176dd65 100644
--- a/pkg/drivers/hyperkit/driver.go
+++ b/pkg/drivers/hyperkit/driver.go
@@ -424,8 +424,8 @@ func (d *Driver) extractKernel(isoPath string) error {
 		pathInIso string
 		destPath  string
 	}{
-		{"/boot/vmlinuz", "vmlinuz"},
-		{"/boot/initrd.img", "initrd.img"},
+		{"/boot/bzimage", "bzimage"},
+		{"/boot/initrd", "initrd"},
 	} {
 		fullDestPath := d.ResolveStorePath(f.destPath)
 		if err := ExtractFile(isoPath, f.pathInIso, fullDestPath); err != nil {