summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/runqemu32
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index f16af9ccf4..23cf5be169 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -118,22 +118,6 @@ while true; do
118 [ -z "$FSTYPE" -o "$FSTYPE" = "$arg" ] && FSTYPE=$arg || \ 118 [ -z "$FSTYPE" -o "$FSTYPE" = "$arg" ] && FSTYPE=$arg || \
119 error "conflicting FSTYPE types [$FSTYPE] and [$arg]" 119 error "conflicting FSTYPE types [$FSTYPE] and [$arg]"
120 ;; 120 ;;
121 *-image*)
122 [ -z "$ROOTFS" ] || \
123 error "conflicting ROOTFS args [$ROOTFS] and [$arg]"
124 if [ -f "$arg" ]; then
125 process_filename $arg
126 elif [ -d "$arg" ]; then
127 # Handle the case where the nfsroot dir has -image-
128 # in the pathname
129 echo "Assuming $arg is an nfs rootfs"
130 FSTYPE=nfs
131 ROOTFS=$arg
132 else
133 ROOTFS=$arg
134 LAZY_ROOTFS="true"
135 fi
136 ;;
137 "ramfs") 121 "ramfs")
138 FSTYPE=cpio.gz 122 FSTYPE=cpio.gz
139 RAMFS=true 123 RAMFS=true
@@ -192,6 +176,22 @@ while true; do
192 "publicvnc") 176 "publicvnc")
193 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -vnc 0.0.0.0:0" 177 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -vnc 0.0.0.0:0"
194 ;; 178 ;;
179 *-image*)
180 [ -z "$ROOTFS" ] || \
181 error "conflicting ROOTFS args [$ROOTFS] and [$arg]"
182 if [ -f "$arg" ]; then
183 process_filename $arg
184 elif [ -d "$arg" ]; then
185 # Handle the case where the nfsroot dir has -image-
186 # in the pathname
187 echo "Assuming $arg is an nfs rootfs"
188 FSTYPE=nfs
189 ROOTFS=$arg
190 else
191 ROOTFS=$arg
192 LAZY_ROOTFS="true"
193 fi
194 ;;
195 "") break ;; 195 "") break ;;
196 *) 196 *)
197 # A directory name is an nfs rootfs 197 # A directory name is an nfs rootfs