| Submitter | Dexuan Cui |
|---|---|
| Date | Nov. 24, 2011, 10:08 a.m. |
| Message ID | <1a0942490d103eab0a5041806613ae16b963ae1b.1322128489.git.dexuan.cui@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/15385/ |
| State | New |
| Headers | show |
Comments
On Thu, 2011-11-24 at 18:08 +0800, Dexuan Cui wrote: > From: Saul Wold <sgw@linux.intel.com> > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > scripts/runqemu | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/runqemu b/scripts/runqemu > index 31e9822..a9a362f 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 As I mentioned to Saul, this is a bad idea since its very close to matching things like bzImage. I seem to remember something with a *image* name being in deploy before and having problems with that. Cheers, Richard
Patch
diff --git a/scripts/runqemu b/scripts/runqemu index 31e9822..a9a362f 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 ||