- make qemu-gtk handle qemu 0.10.0 monitor output.(info vnc change).

- qemu-run fixups (non-gfx mode, handle non-root case).

1 files changed, 12 insertions, 4 deletions

diff --git a/qemu-run b/qemu-run
index fcfd09a..c3212f5 100755
--- a/qemu-run
+++ b/qemu-run
@@ -228,12 +228,18 @@ foreach my $nic (@nics) {
 		$_ . "=" . $nic->{$_};
 	} keys %{$nic}) . "\n"
 	  if $debug;
-	$nic->{'netconfig'} = "tap,vlan=" . $nic->{'vlan'};
-	$nic->{'nicconfig'} = "nic,vlan=" . $nic->{'vlan'};
 
-	$nic->{'netconfig'} .= ",script=" . $tapup;
-	$nic->{'netconfig'} .= ",downscript=" . $tapdown;
+	if ($< == 0) {
+		# root
+		$nic->{'netconfig'} = "tap,vlan=" . $nic->{'vlan'};
+		$nic->{'netconfig'} .= ",script=" . $tapup;
+		$nic->{'netconfig'} .= ",downscript=" . $tapdown;
+	} else {
+		# user
+		$nic->{'netconfig'} = "user,vlan=" . $nic->{'vlan'};
+	}
 
+	$nic->{'nicconfig'} = "nic,vlan=" . $nic->{'vlan'};
 	$nic->{'nicconfig'} .= ",macaddr=" . $nic->{'mac-address'}
 	  if defined($nic->{'mac-address'});
 	$nic->{'nicconfig'} .= ",model=" . $nic->{'model-type'}
@@ -253,6 +259,8 @@ push @cmdline, "unix:,server,nowait";
 if ($graphics) {
 	push @cmdline, "-vnc";
 	push @cmdline, "127.0.0.1:0,to=128,password";
+} else {
+	push @cmdline, "-nographic";
 }
 
 # prepare