]> code.ossystems Code Review - openembedded-core.git/commitdiff
poky-qemu-internal: Don't exit from sourced scripts, return
authorRichard Purdie <richard@openedhand.com>
Wed, 25 Jul 2007 10:39:44 +0000 (10:39 +0000)
committerRichard Purdie <richard@openedhand.com>
Wed, 25 Jul 2007 10:39:44 +0000 (10:39 +0000)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2226 311d38ba-8fff-0310-9ca6-ca027cbcb966

scripts/poky-qemu-internal

index e5bfa2ecbf00bc49cfe075d002b860e3d86ac000..e715844af495f6ccd04aa73b77d0b26504fe7536 100755 (executable)
@@ -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..."