configure kvm.bin so we can call qemu-system-i386 if needed

[pxelator] / lib / PXElator / kvm.pm

diff --git a/lib/PXElator/kvm.pm b/lib/PXElator/kvm.pm
index 13be8a5..5cbc0bc 100644 (file)
--- a/lib/PXElator/kvm.pm
+++ b/lib/PXElator/kvm.pm
@@ -29,7 +29,6 @@ sub monitor {
 }
 
 sub serial {
-       my $nr = $ENV{nr} || 0;
        x11::xterm( 'serial ' . nr() => 'nc ' . port(11000,' ') );
 }
 
@@ -70,13 +69,26 @@ sub start {
        system "brctl addif virtual $ifname"
                unless `brctl show` =~ m{$ifname};
 
+       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 -m $memory_size -net nic,macaddr=$mac
+               $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
        |;
+
+       $kvm .= ' -vnc ' . port(0,':') unless $ENV{DISPLAY};
+
        #       -runas $server::user
        $kvm =~ s{\s+}{ }gs;
 
@@ -85,6 +97,18 @@ sub start {
 
 }
 
+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;