Changeset 1217


Ignore:
Timestamp:
Feb 24, 2011, 10:22:17 AM (8 years ago)
Author:
bruno
Message:
  • *tmout param is optional and now handled and documented as such
Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf.pod

    r1216 r1217  
    475475 Nature: Optional
    476476 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
    477  Value: Time in seconds to wait before interacting with the VM. This should correspond to the time the VM takes to boot.
    478  Conffile: rm
    479  Example: rmtmout default = 180
     477 Value: Time in seconds to wait before interacting with the RM. This may correspond to the time the RM takes to boot.
     478 Conffile: rm
     479 Example: rmtmout default = 10
    480480
    481481=item B<rmtype>
  • devel/pb/bin/pb

    r1216 r1217  
    16151615    }
    16161616    if ($cmt =~ /^(V|R)M/) {
    1617         ($vtmout) = pb_conf_get($tmout);
     1617        ($vtmout) = pb_conf_get_if($tmout);
    16181618    }
    16191619    my $remhost = $sshhost->{$ENV{'PBPROJ'}};
     
    16231623        $remhost = pb_distro_get_param($pbos,$sshhost);
    16241624    }
    1625     pb_log(2,"ssh: ".Dumper(($remhost,$sshlogin,$remdir,$sshport,$vtmout,$vepath,$rbsconf))."\n");
     1625    pb_log(2,"ssh: ".Dumper(($remhost,$sshlogin,$remdir,$sshport,$vepath,$rbsconf))."\n");
     1626    pb_log(2,"ssh: ".Dumper($vtmout)."\n") if (defined $vtmout);
    16261627
    16271628    my $mac;
     
    18441845    $tdir =~ s|\$ENV.+\}/||;
    18451846
    1846     my $tm = undef;
     1847    my $tm = "";
    18471848    if ($cmt =~ /^(V|R)M/) {
    1848         $tm = $vtmout->{$v};
     1849        $tm = "sleep $vtmout->{$v}" if (defined $vtmout);
    18491850    }
    18501851
     
    20002001            $hoption = "" ;
    20012002        }
    2002         pb_system("$shcmd \"sudo $hpath $hoption \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     2003        pb_system("$shcmd \"sudo $hpath $hoption \"; $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
    20032004    }
    20042005    if (($cmt =~ /^VE/) && ($snapme != 0)) {
Note: See TracChangeset for help on using the changeset viewer.