[CONSOLIDATED,PULL,11/23] runqemu: look for *-image* to be more flexible for image names

Submitted by Saul Wold on Nov. 29, 2011, 8:26 a.m.

Details

Message ID c2f88c658b73da67d93312591b3e67b42f629fe3.1322554983.git.sgw@linux.intel.com
State Accepted
Commit c2f88c658b73da67d93312591b3e67b42f629fe3
Headers show

Commit Message

Saul Wold Nov. 29, 2011, 8:26 a.m. 
We can't just look for *image* since it will catch up bzimage

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 scripts/runqemu |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/scripts/runqemu b/scripts/runqemu
index 31e9822..4adeace 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -114,7 +114,7 @@  while [ $i -le $# ]; do
                 usage
             fi
             ;;
-        *-image-*)
+        *-image*)
             if [ -z "$ROOTFS" ]; then
                 if [ -f "$arg" ]; then
                     process_filename $arg
@@ -307,7 +307,7 @@  findimage() {
 
     # Sort rootfs candidates by modification time - the most
     # recently created one is the one we most likely want to boot.
-    filenames=`ls -t $where/*core-image*$machine.$extension 2>/dev/null | xargs`
+    filenames=`ls -t $where/*-image*$machine.$extension 2>/dev/null | xargs`
     for name in $filenames; do
         if [[ "$name" =~ core-image-sato-sdk ||
               "$name" =~ core-image-sato     ||