Changeset 1217

Timestamp:

02/24/11 10:22:17 (2 years ago)

Author:

bruno

Message:

• *tmout param is optional and now handled and documented as such

Location:

devel

Files:

• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (4 diffs)

devel/pb-modules/etc/pb.conf.pod

@@ -475 +475 @@
  Nature: Optional
  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.
- Value: Time in seconds to wait before interacting with the VM. This should correspond to the time the VM takes to boot.
- Conffile: rm
- Example: rmtmout default = 180
+ Value: Time in seconds to wait before interacting with the RM. This may correspond to the time the RM takes to boot.
+ Conffile: rm
+ Example: rmtmout default = 10
 
 =item B<rmtype>

devel/pb/bin/pb

@@ -1615 +1615 @@
     }
     if ($cmt =~ /^(V|R)M/) {
-        ($vtmout) = pb_conf_get($tmout);
+        ($vtmout) = pb_conf_get_if($tmout);
     }
     my $remhost = $sshhost->{$ENV{'PBPROJ'}};
@@ -1623 +1623 @@
         $remhost = pb_distro_get_param($pbos,$sshhost);
     }
-    pb_log(2,"ssh: ".Dumper(($remhost,$sshlogin,$remdir,$sshport,$vtmout,$vepath,$rbsconf))."\n");
+    pb_log(2,"ssh: ".Dumper(($remhost,$sshlogin,$remdir,$sshport,$vepath,$rbsconf))."\n");
+    pb_log(2,"ssh: ".Dumper($vtmout)."\n") if (defined $vtmout);
 
     my $mac;
@@ -1844 +1845 @@
     $tdir =~ s|\$ENV.+\}/||;
 
-    my $tm = undef;
+    my $tm = "";
     if ($cmt =~ /^(V|R)M/) {
-        $tm = $vtmout->{$v};
+        $tm = "sleep $vtmout->{$v}" if (defined $vtmout);
     }
 
@@ -2000 +2001 @@
             $hoption = "" ;
         }
-        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)");
+        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)");
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {