Changeset 1714 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Mar 10, 2013, 6:17:47 PM (11 years ago)

Author:

Bruno Cornec

Message:

• remove param vmntpcmd and use oscmdntp instead placed in pb.conf
• Improve ntp handling for setupvm by adding a call to date when ntpdate is failing
• Update appropriate docs
• Fix pb_get_sudocmds which was using @_ directly which was impacting parameters in the calling function, and removed e.g. the ntp server name from the cmd line !
• TODO: if a ntpd server is running, avoid doing all ntp/date stuff

File:

• devel/pb/bin/pb (modified) (6 diffs)

devel/pb/bin/pb

@@ -1915 +1915 @@
     my $tmout = undef;
     my $path = undef;
+
     if ($cmt =~ /^VM/) {
         $login = "vmlogin";
@@ -2746 +2747 @@
 my $nontp = shift || 0;
 
+pb_log(1,"Entering pb_date2v\n");
 # VE gets time from parent OS.
 return "/bin/true" if ($vtype) =~ /^ve/o; 
 
 my ($ntp) = pb_conf_get_if($vtype."ntp");
-my $vntp = $ntp->{$ENV{'PBPROJ'}} if (defined $ntp);
+my $vntp = undef;
 my $ntpline = undef;
+$vntp = $ntp->{$ENV{'PBPROJ'}} if (defined $ntp);
 
 if ((defined $vntp) && ($vntp !~ /^\s*$/)) {
+    pb_log(2,"ntp server is $vntp\n");
     # ntp command depends on pbos
-    my $vntpcmd = pb_distro_get_param($pbos,pb_conf_get($vtype."ntpcmd"));
+    my $vntpcmd = pb_distro_get_param($pbos,pb_conf_get("oscmdntp"));
     $ntpline = "sudo $vntpcmd $vntp";
 }
@@ -2765 +2769 @@
 my $dateline = "sudo /bin/date $upddate";
 if ((defined $ntpline) && ($nontp == 0)) {
+    pb_log(1,"pb_date2v returns $ntpline\n");
     return($ntpline);
 } else {
+    pb_log(1,"pb_date2v returns $dateline\n");
     return($dateline);
 }
@@ -3408 +3414 @@
 print PBOUT "$pbac->{$ENV{'PBPROJ'}}   ALL=(ALL) NOPASSWD:ALL\n";
 EOF
-}
+    }
     print SCRIPT << 'EOF';
 close(PBOUT);
@@ -3419 +3425 @@
         # Sync date
         # do it after sudoers is setup
-        print SCRIPT "pb_system(\"$ntpline\",\"Updating time with $ntpline\",\"mayfail\");\n";
+        print SCRIPT "my \$res = pb_system(\"$ntpline\",\"Updating time with $ntpline\",\"mayfailverbose\");\n";
+        print SCRIPT "if (\$res != 0) {\n";
+        # try again with another method
+        $ntpline = pb_date2v($vtype,$pbos,1);
+        print SCRIPT "  pb_system(\"$ntpline\",\"Updating time with $ntpline\",\"mayfailverbose\");\n";
+        print SCRIPT "}\n";
     }
 
@@ -4382 +4393 @@
         
 my $pbos = shift;
+my @cmds = @_;
 my %sudocmds;
 
-pb_log(2,"pb_get_sudocmds entering with lines:".Dumper(@_)."\n");
-foreach my $c (split(/;/,$pbos->{'update'}),split(/;/,$pbos->{'install'}),@_) {
+pb_log(2,"pb_get_sudocmds entering with lines:".Dumper(@cmds)."\n");
+foreach my $c (split(/;/,$pbos->{'update'}),split(/;/,$pbos->{'install'}),@cmds) {
     pb_log(2,"pb_get_sudocmds analyses $c\n");
     next if ($c !~ /^\s*sudo/);