Fix VM usage and update ex/runvm

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon / Format.pm

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 4a57d6a38b6757e99f6906645341efb21588095c..7b6f77bcc6c24527021b095e04dbe58f55181897 100644 (file)
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -29,8 +29,10 @@ sub runvm {
        my $cmd = $ENV{GRUNTMASTER_VM};
        $cmd .= ' ' . $arg if $arg;
        get_logger->trace("Starting VM $name ($cmd)");
        my $cmd = $ENV{GRUNTMASTER_VM};
        $cmd .= ' ' . $arg if $arg;
        get_logger->trace("Starting VM $name ($cmd)");

-       $vm{$name} = Expect->spawn($cmd);
+       $vm{$name} = Expect->new;

        $vm{$name}->raw_pty(1);
        $vm{$name}->raw_pty(1);

+       $vm{$name}->log_stdout(0);
+       $vm{$name}->spawn($cmd);

        $vm{$name}->expect(5, '# ') or get_logger->logdie("Error while starting VM $name: ". $vm{$name}->error);
 }
 
        $vm{$name}->expect(5, '# ') or get_logger->logdie("Error while starting VM $name: ". $vm{$name}->error);
 }
 


@@ -66,7 +68,7 @@ sub execlist {
        if ($vm{$vm}) {
                my $cmd = ">$er " . shell_quote 'gruntmaster-exec', @args;
                get_logger->trace("Running in VM $vm: $cmd");
        if ($vm{$vm}) {
                my $cmd = ">$er " . shell_quote 'gruntmaster-exec', @args;
                get_logger->trace("Running in VM $vm: $cmd");

-               $vm{$vm}->send($cmd);
+               $vm{$vm}->send($cmd, "\n");

        } else {
                $pid{$vm} = fork // die "Cannot fork\n";
                unless ($pid{$vm}) {
        } else {
                $pid{$vm} = fork // die "Cannot fork\n";
                unless ($pid{$vm}) {