summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-02-24 11:23:28 -0800
committerRichard Purdie <rpurdie@linux.intel.com>2011-03-01 11:46:41 +0000
commit9f9e981ca20fe341a27765390fa723295b74a389 (patch)
treef1f05d60c29a313f0aa4282e85ee6bafd100ac5c
parent6667dd32845061652810835d9a48ede57bf7943f (diff)
downloadopenembedded-core-9f9e981ca20fe341a27765390fa723295b74a389.tar.gz
openembedded-core-9f9e981ca20fe341a27765390fa723295b74a389.tar.bz2
openembedded-core-9f9e981ca20fe341a27765390fa723295b74a389.tar.xz
openembedded-core-9f9e981ca20fe341a27765390fa723295b74a389.zip
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>
-rwxr-xr-xscripts/poky-qemu6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 1086c3df1..c76b3ab7b 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"