Mercurial > hg > aboriginal

changeset 640:b4ea140d2439

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add $QEMU_EXTRA for emulator command line arguments.
author Rob Landley <rob@landley.net>
date Fri, 20 Mar 2009 09:06:46 -0500
parents a93ace5fbfc1
children 243594326fb2
files sources/toys/run-emulator.sh system-image.sh
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/sources/toys/run-emulator.sh	Thu Mar 19 23:37:33 2009 -0500
+++ b/sources/toys/run-emulator.sh	Fri Mar 20 09:06:46 2009 -0500
@@ -26,7 +26,7 @@
   elif [ "$1" == "--memory" ]
   then
     shift
-    MEMORY="-m $1"
+    QEMU_EXTRA"-m $1 $QEMU_EXTRA"
   else
     (
       echo "unknown argument $1"
--- a/system-image.sh	Thu Mar 19 23:37:33 2009 -0500
+++ b/system-image.sh	Fri Mar 20 09:06:46 2009 -0500
@@ -140,9 +140,9 @@
     APPEND="root=/dev/$ROOT rw init=/$TOOLSDIR/sbin/init.sh "
   fi
 
-  echo "-nographic -no-reboot -kernel \"$2\" \$WITH_HDB \$MEMORY ${HDA}" \
+  echo "-nographic -no-reboot -kernel \"$2\" \$WITH_HDB ${HDA}" \
     "-append \"${APPEND}panic=1 PATH=\$DISTCC_PATH_PREFIX/${TOOLSDIR}/bin" \
-    "console=$CONSOLE \$KERNEL_EXTRA\""
+    "console=$CONSOLE \$KERNEL_EXTRA\" \$QEMU_EXTRA"
 }
 
 # Write out a script to call the appropriate emulator.  We split out the