X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=68f6efc843606e071db651b3f083a6fdd5a586bc;hb=74ea5e7e82ed3a4f7fa981907177cf55b9b88f07;hp=d2e9ec37c74da73f8f5dc162db59ea6cd90e57d8;hpb=9de3adafdda1c61a43dc70ec8d48f0b5652a1fa1;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index d2e9ec37..68f6efc8 100755
--- a/RunQemu
+++ b/RunQemu
@@ -9,9 +9,12 @@ QEMU_PARAMS=""
 QEMU_PARAMS=$QEMU_PARAMS" -hda AcessHDD.img"
 QEMU_PARAMS=$QEMU_PARAMS" -vga std"
 QEMU_PARAMS=$QEMU_PARAMS" -smp 2"
-QEMU_PARAMS=$QEMU_PARAMS" -net nic"
+QEMU_PARAMS=$QEMU_PARAMS" -net nic,model=e1000"
+#QEMU_PARAMS=$QEMU_PARAMS" -net nic,model=rtl8139"
 
-_NETTYPE="user"
+_NETTYPE="user,hostfwd=tcp::5555-:23"
+
+_EVAL=eval
 
 while [ $# -ne 0 ]; do
 	case $1 in
@@ -26,7 +29,7 @@ while [ $# -ne 0 ]; do
 			_kfile="KernelLand/Acess2.$1-$2.bin"
 		fi
 		BOOTOPT="-kernel $_kfile"
-		BOOTOPT=$BOOTOPT" -initrd KernelLand/Modules/Filesystems/FS_InitRD.kmd.$1 -append $3"
+		BOOTOPT=$BOOTOPT" -initrd KernelLand/Modules/Filesystems/FS_InitRD.kmd.$1 -append \"$3\""
 		shift
 		shift
 		;;
@@ -47,6 +50,9 @@ while [ $# -ne 0 ]; do
 		shift
 		QEMU_PARAMS=$QEMU_PARAMS" "$1
 		;;
+	-n)
+		_EVAL=echo
+		;;
 	-fwd)
 		_NETTYPE=$_NETTYPE",hostfwd=tcp::10023-10.0.2.10:23"
 		;;
@@ -80,13 +86,13 @@ fi
 #	qemu-system-x86_64 $QEMU_PARAMS -serial stdio | tee QemuLog.txt
 #echo $QEMU $BOOTOPT $QEMU_PARAMS
 if [ "x$_NOGRAPHIC" = "xyes" ] ; then
-	$QEMU $BOOTOPT $QEMU_PARAMS -nographic
+	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -nographic | tee QemuLog.txt
 	exit
 fi
 
 if [ "x$_NOTEE" = "xyes" ] ; then
-	$QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
 	exit
 fi
 
-$QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
+$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt