--- lib/PXElator/kvm.pm	2009/08/06 22:11:02	170
+++ lib/PXElator/kvm.pm	2009/08/16 21:35:23	229
@@ -20,7 +20,7 @@
 	return join( $del, $server::ip, $port );
 }
 
-sub start_fork { qw/monitor wireshark/ }
+sub fork_if_active { qw/monitor/ }
 
 use x11;
 
@@ -28,10 +28,6 @@
 	x11::xterm( "monitor $nr" => 'nc ' . port(' ') );
 }
 
-sub wireshark {
-	exec "wireshark -k -i tap0";
-}
-
 sub actions { qw/reset activate/ }
 
 sub reset {
@@ -50,12 +46,23 @@
 	my $mac = sprintf('AC:DE:48:00:00:%02x', $nr);
 	my $mon = port(':');
 
+	my $ifname = 'kvm0';
+
+#	system "ifconfig $ifname down";
+#	system "brctl delif virtual $ifname";
+#	system "tunctl -d $ifname";
+
+	system "tunctl -t $ifname"; # -u $server::user
+	system "ifconfig $ifname up";
+	system "brctl addif virtual $ifname";
+
 	my $kvm = qq|
-		vdeq kvm -m $memory_size -net nic,vlan=1,macaddr=$mac
-		-net vde,vlan=1,sock=/var/run/vde2/tap0.ctl
+		kvm -m $memory_size -net nic,macaddr=$mac
+		-net tap,ifname=$ifname,script=no
 		-boot n
 		-monitor tcp:$mon,server,nowait
 	|;
+	#	-runas $server::user
 	$kvm =~ s{\s+}{ }gs;
 
 	warn $kvm;