--- lib/PXElator/kvm.pm	2009/09/13 15:51:03	429
+++ lib/PXElator/kvm.pm	2010/07/21 17:50:32	512
@@ -69,15 +69,20 @@
 	system "brctl addif virtual $ifname"
 		unless `brctl show` =~ m{$ifname};
 
-	my $name = client::conf( client::ip_from_mac $mac, 'hostname' );
+	my $ip = client::ip_from_mac $mac;
+
+	my $name = client::conf( $ip, 'hostname' );
 	$name ||= $nr;
 
+	my $kvm_bin = client::conf( $ip => 'kvm.bin' ) || 'kvm';
+	my $boot = client::conf( $ip, 'kvm.boot' ) || 'n'; # network by default
+
 	my $kvm = qq|
-		kvm
+		$kvm_bin
 		-name "$name"
 		-m $memory_size -net nic,macaddr=$mac
 		-net tap,ifname=$ifname,script=no
-		-boot n
+		-boot $boot
 		-monitor tcp:$mon,server,nowait
 		-serial  tcp:$ser,server,nowait
 	|;
@@ -94,7 +99,7 @@
 
 sub nr_from_mac {
 	my $mac = shift;
-	$mac =~ s{^.+:([0-9a-f]{2})$}{hex($1)}e;
+	$mac =~ s<^.+:([0-9a-f]{2})$><hex($1)>e;
 	$mac;
 }