summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-02-24 11:23:28 -0800
committerSaul Wold <sgw@linux.intel.com>2011-02-25 08:46:59 -0800
commit0897b00452c991edb8e2f5ca5669277e136df3b2 (patch)
treea14f332428ce6e78b1038ca196632b56219ebe1f
parent1cf7d6c214c560ae3408ebddf02eed8705304ce7 (diff)
downloadpoky-0897b00452c991edb8e2f5ca5669277e136df3b2.tar.gz
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 1086c3df1e..c76b3ab7b6 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -113,6 +113,12 @@ while [ $i -le $# ]; do
113 if [ -z "$ROOTFS" ]; then 113 if [ -z "$ROOTFS" ]; then
114 if [ -f "$arg" ]; then 114 if [ -f "$arg" ]; then
115 process_filename $arg 115 process_filename $arg
116 elif [ -d "$arg" ]; then
117 # Handle the case where the nfsroot dir has -image-
118 # in the pathname
119 echo "Assuming $arg is an nfs rootfs"
120 FSTYPE=nfs
121 ROOTFS=$arg
116 else 122 else
117 ROOTFS=$arg 123 ROOTFS=$arg
118 LAZY_ROOTFS="true" 124 LAZY_ROOTFS="true"