summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-07-25 10:39:44 +0000
committerRichard Purdie <richard@openedhand.com>2007-07-25 10:39:44 +0000
commit8e4a14b7755d02c09a2d460773173ab604657868 (patch)
treec414ac3448726f63964df111fa134c09cf16aeae
parent3b53e52a7e8a09d315257941e6d1f571f380a15b (diff)
downloadpoky-8e4a14b7755d02c09a2d460773173ab604657868.tar.gz
poky-8e4a14b7755d02c09a2d460773173ab604657868.tar.bz2
poky-8e4a14b7755d02c09a2d460773173ab604657868.zip
poky-qemu-internal: Don't exit from sourced scripts, return
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2226 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xscripts/poky-qemu-internal12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index e5bfa2ecbf..e715844af4 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -44,17 +44,17 @@ fi
if [ "$TYPE" != "nfs" -a ! -f "$HDIMAGE" ]; then
echo "Error, image file $HDIMAGE doesn't exist"
- exit 1
+ return
fi
if [ ! -f "$ZIMAGE" ]; then
echo "Error, kernel image file $ZIMAGE doesn't exist"
- exit 1
+ return
fi
if [ "$MACHINE" != "qemuarm" -a "$MACHINE" != "qemux86" -a "$MACHINE" != "akita" -a "$MACHINE" != "spitz" ]; then
echo "Error, unsupported machine type $MACHINE"
- exit 1
+ return
fi
if [ "$MACHINE" = "qemuarm" ]; then
@@ -68,7 +68,7 @@ if [ "$MACHINE" = "qemuarm" ]; then
fi
if [ ! -d "$HDIMAGE" ]; then
echo "Error, NFS mount point $HDIMAGE doesn't exist"
- exit 1
+ return
fi
QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb"
fi
@@ -85,7 +85,7 @@ if [ "$MACHINE" = "qemux86" ]; then
fi
if [ ! -d "$HDIMAGE" ]; then
echo "Error, NFS mount point $HDIMAGE doesn't exist."
- exit 1
+ return
fi
QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD"
fi
@@ -119,7 +119,7 @@ fi
if [ "x$QEMUOPTIONS" = "x" ]; then
echo "Error, unable to support this combination of options"
- exit 1
+ return
fi
echo "Running $QEMU using sudo..."