From: Stefano Stabellini <sstabellini@kernel.org>
Date: Tue, 23 May 2017 21:39:55 +0000 (-0700)
Subject: raisin: check for invalid initrds
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=41b89885355406ff938a39086f873a6c0cee560f;p=raisin.git

raisin: check for invalid initrds

get_host_initrd can return an invalid or null initrd. Do not set the
ramdisk option in the VM config file to an invalid value.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/tests/busybox-pv b/tests/busybox-pv
index a7ae976..7ad4f7a 100755
--- a/tests/busybox-pv
+++ b/tests/busybox-pv
@@ -21,7 +21,6 @@ function busybox-pv-test() {
 
     cat >busybox-pv <<EOF
 kernel = "`get_host_kernel`"
-ramdisk = "`get_host_initrd`"
 extra = "root=/dev/xvda console=hvc0"
 memory = 512
 name = "raisin-test"
@@ -31,6 +30,10 @@ serial="pty"
 boot="c"
 vif=['bridge=xenbr1']
 EOF
+    if [[ -e "`get_host_initrd`" ]]
+    then
+        echo "ramdisk = \"`get_host_initrd`\"" >> busybox-pv
+    fi
 
     $SUDO xl create busybox-pv
     check_guest_alive