allow random junk after .iso

[pxelator] / lib / PXElator / kvm.pm

diff --git a/lib/PXElator/kvm.pm b/lib/PXElator/kvm.pm
index ad07ed6..c6e4383 100644 (file)
--- a/lib/PXElator/kvm.pm
+++ b/lib/PXElator/kvm.pm
@@ -6,28 +6,85 @@ use autodie;
 
 use server;
 
+use Data::Dump qw/dump/;
+
 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';
 
-sub start_options { qw/monitor/ }
+# AC = private, AD = multicast, AE = local
+
+sub nr { $ENV{nr} || 0 };
+
+sub port {
+       my ($port,$del) = @_;
+       $port += nr();
+       return join( $del, $server::ip, $port );
+}
+
+sub fork_if_active { qw/monitor serial/ }
+
+use x11;
 
 sub monitor {
-       exec "xterm -e nc $server::ip 10000";
+       x11::xterm( 'monitor ' . nr() => 'nc ' . port(10000,' ') );
 }
 
-use network;
+sub serial {
+       x11::xterm( 'serial ' . nr() => 'nc ' . port(11000,' ') );
+}
+
+sub actions { qw/reset activate/ }
+
+sub reset {
+       my $sock = IO::Socket::INET->new( port(10000,':') );
+       print $sock "system_reset\n";
+       close $sock;
+}
+
+sub activate {
+       system "xdotool windowactivate `xdotool search --class kvm`"
+}
 
 sub start {
+       my $nr = $ENV{nr} || 0;
 
-       network::tap();
+       my $mac = sprintf('AC:DE:48:00:00:%02x', $nr);
+       my $mon = port(10000,':');
+       my $ser = port(11000,':');
+
+       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";
+
+       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|
-               vdeq kvm -m $memory_size -net nic,vlan=1,macaddr=$mac
-               -net vde,vlan=1,sock=/var/run/vde2/tap0.ctl
+               kvm
+               -name "$name"
+               -m $memory_size -net nic,macaddr=$mac
+               -net tap,ifname=$ifname,script=no
                -boot n
-               -monitor $monitor
+               -monitor tcp:$mon,server,nowait
+               -serial  tcp:$ser,server,nowait
        |;
+
+       $kvm .= ' -vnc ' . port(0,':') unless $ENV{DISPLAY};
+
+       #       -runas $server::user
        $kvm =~ s{\s+}{ }gs;
 
        warn $kvm;
@@ -35,6 +92,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;