Minor improvement for custom kernel image
Makefile supports providing a custom kernel image. This may not be
gzipped as the default image is. Change the host.sh script of CrosVM
HelloWorld test to try extracting first and if that fails, just copy the
file to its destination.
Change-Id: I9836adb7fb01779713c590203342fe0ad4eed8cf
diff --git a/crosvm/helloworld/host.sh b/crosvm/helloworld/host.sh
index f569358..35f4f12 100644
--- a/crosvm/helloworld/host.sh
+++ b/crosvm/helloworld/host.sh
@@ -20,7 +20,7 @@
FAIL() { echo -e "\e[31mFAIL\e[0m"; }
CLIENT_SH=/dev/vdc
-KERNEL_IMAGE_GZ=/dev/vdd
+KERNEL_IMAGE=/dev/vdd
ROOT_FS=/dev/vde
CROSVM_FS=/dev/vdf
@@ -31,7 +31,11 @@
CROSVM=${CROSVM_MOUNT}/bin/crosvm
mount ${CROSVM_FS} ${CROSVM_MOUNT}
-zcat ${KERNEL_IMAGE_GZ} > ${KERNEL_BIN}
+
+# Try to extract first (assuming this is Image.gz), otherwise
+# assume it is a raw binary.
+(zcat ${KERNEL_IMAGE} > ${KERNEL_BIN}) || \
+ cp ${KERNEL_IMAGE} ${KERNEL_BIN}
${CROSVM} run --disable-sandbox \
-r ${ROOT_FS} -d ${CLIENT_SH} \
