--- lib/PXElator/kvm.pm	2009/08/16 21:35:23	229
+++ lib/PXElator/kvm.pm	2009/09/13 15:51:03	429
@@ -12,26 +12,30 @@
 
 # AC = private, AD = multicast, AE = local
 
-our $nr = 0;
+sub nr { $ENV{nr} || 0 };
 
 sub port {
-	my $del = shift;
-	my $port = 10000 + $nr;
+	my ($port,$del) = @_;
+	$port += nr();
 	return join( $del, $server::ip, $port );
 }
 
-sub fork_if_active { qw/monitor/ }
+sub fork_if_active { qw/monitor serial/ }
 
 use x11;
 
 sub monitor {
-	x11::xterm( "monitor $nr" => 'nc ' . port(' ') );
+	x11::xterm( 'monitor ' . nr() => 'nc ' . port(10000,' ') );
+}
+
+sub serial {
+	x11::xterm( 'serial ' . nr() => 'nc ' . port(11000,' ') );
 }
 
 sub actions { qw/reset activate/ }
 
 sub reset {
-	my $sock = IO::Socket::INET->new( port(':') );
+	my $sock = IO::Socket::INET->new( port(10000,':') );
 	print $sock "system_reset\n";
 	close $sock;
 }
@@ -41,27 +45,45 @@
 }
 
 sub start {
-	my $nr = shift || 0;
+	my $nr = $ENV{nr} || 0;
 
 	my $mac = sprintf('AC:DE:48:00:00:%02x', $nr);
-	my $mon = port(':');
+	my $mon = port(10000,':');
+	my $ser = port(11000,':');
+
+	my $ifname = 'kvm' . $nr;
 
-	my $ifname = 'kvm0';
+	warn "# kvm start $nr $mac $mon $ser $ifname";
 
 #	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 $ifconfig = `/sbin/ifconfig $ifname`;
+
+ 	# FIXME tunctl -u $server::user
+	system "tunctl -t $ifname"
+		unless $ifconfig =~ m{$ifname};
+	system "ifconfig $ifname up"
+		unless $ifconfig =~ m{UP};
+	system "brctl addif virtual $ifname"
+		unless `brctl show` =~ m{$ifname};
+
+	my $name = client::conf( client::ip_from_mac $mac, 'hostname' );
+	$name ||= $nr;
 
 	my $kvm = qq|
-		kvm -m $memory_size -net nic,macaddr=$mac
+		kvm
+		-name "$name"
+		-m $memory_size -net nic,macaddr=$mac
 		-net tap,ifname=$ifname,script=no
 		-boot n
 		-monitor tcp:$mon,server,nowait
+		-serial  tcp:$ser,server,nowait
 	|;
+
+	$kvm .= ' -vnc ' . port(0,':') unless $ENV{DISPLAY};
+
 	#	-runas $server::user
 	$kvm =~ s{\s+}{ }gs;
 
@@ -70,6 +92,18 @@
 
 }
 
+sub nr_from_mac {
+	my $mac = shift;
+	$mac =~ s{^.+:([0-9a-f]{2})$}{hex($1)}e;
+	$mac;
+}
+
+sub next_nr {
+	my @kvms = glob "$server::conf/mac/AC:DE:48:00:00:*";
+	my $nr = nr_from_mac( pop @kvms );
+	return $nr + 1;
+}
+
 warn 'loaded';
 
 1;