--- lib/PXElator/kvm.pm	2009/07/30 14:16:13	56
+++ lib/PXElator/kvm.pm	2009/07/31 17:07:39	82
@@ -4,51 +4,32 @@
 use strict;
 use autodie;
 
-use File::Slurp;
-
 use server;
 
-my $interfaces = read_file '/etc/network/interfaces';
-
-if ( $interfaces !~ m{tap0.*$server::ip}s ) {
-
-	system "sudo apt-get install vde2";
-
-	$interfaces .= qq{
-
-iface tap0 inet static
-  address $server::ip
-  netmask $server::netmask
-  vde2-switch -
-
-	};
+our $memory_size = 512;
+our $mac = 'AC:DE:48:00:00:01'; # AC = private, AD = multicast, AE = local
+our $monitor = 'tcp:' . $server::ip . ':10000,server,nowait';
 
-	write_file '/etc/network/interfaces', $interfaces;
+sub start_options { qw/monitor/ }
 
+sub monitor {
+	exec "xterm -e nc $server::ip 10000";
 }
 
-if ( grep /tap0/, read_file '/proc/net/dev' ) {
-	warn "tap0 started";
-} else {
-	system "sudo ifup tap0";
-}
-
-our $memory_size = 512;
-our $mac = '52:54:00:00:00:01';
+use network;
 
 sub start {
 
+	network::tap();
+
 	my $kvm = qq|
 		vdeq kvm -m $memory_size -net nic,vlan=1,macaddr=$mac
 		-net vde,vlan=1,sock=/var/run/vde2/tap0.ctl
 		-boot n
-		-monitor stdio
+		-monitor $monitor
 	|;
-
-
-	$kvm = "xterm -e $kvm" if $ENV{DISPLAY};
-
 	$kvm =~ s{\s+}{ }gs;
+
 	warn $kvm;
 	exec $kvm;