summaryrefslogtreecommitdiffstats
path: root/scripts/poky-qemu-internal
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 /scripts/poky-qemu-internal
parent3b53e52a7e8a09d315257941e6d1f571f380a15b (diff)
downloadpoky-8e4a14b7755d02c09a2d460773173ab604657868.tar.gz
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
Diffstat (limited to 'scripts/poky-qemu-internal')
-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
44 44
45if [ "$TYPE" != "nfs" -a ! -f "$HDIMAGE" ]; then 45if [ "$TYPE" != "nfs" -a ! -f "$HDIMAGE" ]; then
46 echo "Error, image file $HDIMAGE doesn't exist" 46 echo "Error, image file $HDIMAGE doesn't exist"
47 exit 1 47 return
48fi 48fi
49 49
50if [ ! -f "$ZIMAGE" ]; then 50if [ ! -f "$ZIMAGE" ]; then
51 echo "Error, kernel image file $ZIMAGE doesn't exist" 51 echo "Error, kernel image file $ZIMAGE doesn't exist"
52 exit 1 52 return
53fi 53fi
54 54
55if [ "$MACHINE" != "qemuarm" -a "$MACHINE" != "qemux86" -a "$MACHINE" != "akita" -a "$MACHINE" != "spitz" ]; then 55if [ "$MACHINE" != "qemuarm" -a "$MACHINE" != "qemux86" -a "$MACHINE" != "akita" -a "$MACHINE" != "spitz" ]; then
56 echo "Error, unsupported machine type $MACHINE" 56 echo "Error, unsupported machine type $MACHINE"
57 exit 1 57 return
58fi 58fi
59 59
60if [ "$MACHINE" = "qemuarm" ]; then 60if [ "$MACHINE" = "qemuarm" ]; then
@@ -68,7 +68,7 @@ if [ "$MACHINE" = "qemuarm" ]; then
68 fi 68 fi
69 if [ ! -d "$HDIMAGE" ]; then 69 if [ ! -d "$HDIMAGE" ]; then
70 echo "Error, NFS mount point $HDIMAGE doesn't exist" 70 echo "Error, NFS mount point $HDIMAGE doesn't exist"
71 exit 1 71 return
72 fi 72 fi
73 QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb" 73 QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb"
74 fi 74 fi
@@ -85,7 +85,7 @@ if [ "$MACHINE" = "qemux86" ]; then
85 fi 85 fi
86 if [ ! -d "$HDIMAGE" ]; then 86 if [ ! -d "$HDIMAGE" ]; then
87 echo "Error, NFS mount point $HDIMAGE doesn't exist." 87 echo "Error, NFS mount point $HDIMAGE doesn't exist."
88 exit 1 88 return
89 fi 89 fi
90 QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD" 90 QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD"
91 fi 91 fi
@@ -119,7 +119,7 @@ fi
119 119
120if [ "x$QEMUOPTIONS" = "x" ]; then 120if [ "x$QEMUOPTIONS" = "x" ]; then
121 echo "Error, unable to support this combination of options" 121 echo "Error, unable to support this combination of options"
122 exit 1 122 return
123fi 123fi
124 124
125echo "Running $QEMU using sudo..." 125echo "Running $QEMU using sudo..."