From: Scott Garman <scott.a.garman@intel.com>
Date: Thu, 24 Feb 2011 19:23:28 +0000 (-0800)
Subject: poky-qemu: handle cases where an nfs directory contains -image-
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~46394
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f9e981ca20fe341a27765390fa723295b74a389;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

poky-qemu: handle cases where an nfs directory contains -image-

Previously we mistakenly assumed that any argument which contained
*-image-* was the name of a rootfs image file. This allows nfs
directory paths to work correctly when they contain this substring.

This fixes [BUGID #743]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---

diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 1086c3df1e1..c76b3ab7b6e 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -113,6 +113,12 @@ while [ $i -le $# ]; do
             if [ -z "$ROOTFS" ]; then
                 if [ -f "$arg" ]; then
                     process_filename $arg
+                elif [ -d "$arg" ]; then
+                    # Handle the case where the nfsroot dir has -image-
+                    # in the pathname
+                    echo "Assuming $arg is an nfs rootfs"
+                    FSTYPE=nfs
+                    ROOTFS=$arg
                 else
                     ROOTFS=$arg
                     LAZY_ROOTFS="true"