added conf/ip/1.2.3.4/kvm.boot for FreeNAS

[pxelator] / lib / PXElator / kvm.pm

diff --git a/lib/PXElator/kvm.pm b/lib/PXElator/kvm.pm
index 139aefa..558cc4d 100644 (file)
--- a/lib/PXElator/kvm.pm
+++ b/lib/PXElator/kvm.pm
@@ -12,11 +12,11 @@ our $memory_size = 512;
 
 # AC = private, AD = multicast, AE = local
 
-our $nr = 0;
+sub nr { $ENV{nr} || 0 };
 
 sub port {
        my ($port,$del) = @_;
-       $port += $nr;
+       $port += nr();
        return join( $del, $server::ip, $port );
 }
 
@@ -25,11 +25,11 @@ sub fork_if_active { qw/monitor serial/ }
 use x11;
 
 sub monitor {
-       x11::xterm( "monitor $nr" => 'nc ' . port(10000,' ') );
+       x11::xterm( 'monitor ' . nr() => 'nc ' . port(10000,' ') );
 }
 
 sub serial {
-       x11::xterm( "serial $nr" => 'nc ' . port(11000,' ') );
+       x11::xterm( 'serial ' . nr() => 'nc ' . port(11000,' ') );
 }
 
 sub actions { qw/reset activate/ }
@@ -45,29 +45,49 @@ sub activate {
 }
 
 sub start {
-       my $nr = shift || 0;
+       my $nr = $ENV{nr} || 0;
 
        my $mac = sprintf('AC:DE:48:00:00:%02x', $nr);
        my $mon = port(10000,':');
        my $ser = port(11000,':');
 
-       my $ifname = 'kvm0';
+       my $ifname = 'kvm' . $nr;
+
+       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 $ip = client::ip_from_mac $mac;
+
+       my $name = client::conf( $ip, 'hostname' );
+       $name ||= $nr;
+
+       my $boot = client::conf( $ip, 'kvm.boot' ) || 'n'; # network by default
 
        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
+               -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;
 
@@ -76,6 +96,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;