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

Timestamp:

Dec 11, 2008, 12:30:24 AM (15 years ago)

Author:

Bruno Cornec

Message:

• restore PBVMOPT after modification at end of loop to get the right options each time
• Adds pb_date_v to handle date in VMs correctly with either ntp or forced date

File:

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

devel/pb/bin/pb

@@ -1380 +1380 @@
             $ENV{'PBVMOPT'} = "";
         }
+        # Save the current status for later restoration
+        $ENV{'PBOLDVMOPT'} = $ENV{'PBVMOPT'};
         # Set a default timeout of 2 minutes
         if (not defined $ENV{'PBVMTMOUT'}) {
@@ -1429 +1431 @@
             die "VM of type $vmtype not supported. Report to the dev team";
         }
+        # Restore the ENV VAR Value
+        $ENV{'PBMOPT'} = $ENV{'PBOLDVMOPT'};
+
         my ($tmpcmd,$void) = split(/ +/,$cmd);
         my $vmexist = pb_check_ps($tmpcmd,$vmm);
@@ -1492 +1497 @@
 }
 
+# Return string for date synchro
+sub pb_date_v {
+
+my $vtype = shift;
+
+my ($ntp) = pb_conf_get($vtype."ntp");
+my $vntp = $ntp->{$ENV{'PBPROJ'}};
+my $ntpline;
+
+if (defined $vntp) {
+    $ntpline = "sudo /usr/sbin/ntpdate $vntp";
+} else {
+    $ntpline = undef;
+}
+# Force new date to be in the future compared to the date 
+# of the host by adding 1 minute
+my @date=pb_get_date();
+$date[1]++;
+my $upddate = strftime("%m%d%H%M%Y", @date);
+my $dateline = "sudo date $upddate";
+return($ntpline,$dateline);
+}
+
 sub pb_build2v {
 
@@ -1498 +1526 @@
 # Prepare the script to be executed on the VM/VE
 # in $ENV{'PBDESTDIR'}/pbscript
-#my ($ntp) = pb_conf_get($vtype."ntp");
-#my $vntp = $ntp->{$ENV{'PBPROJ'}};
-
+my ($ntpline,$dateline) = pb_date_v($vtype);
 open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
 print SCRIPT "#!/bin/bash\n";
@@ -1510 +1536 @@
 print SCRIPT "mv .pbrc \$HOME\n";
 print SCRIPT "cd ..\n";
-# Force new date to be in the future compared to the date of the tar file by adding 1 minute
-my @date=pb_get_date();
-$date[1]++;
-my $upddate = strftime("%m%d%H%M%Y", @date);
-#print SCRIPT "echo Setting up date on $vntp...\n";
-# Or use ntpdate if available TBC
-print SCRIPT "sudo date $upddate\n";
+print SCRIPT "# Time sync\n";
+if (defined $ntpline) {
+    print SCRIPT "if [ -x /usr/sbin/ntpdate ]; then\n";
+    print SCRIPT "  $ntpline\n";
+    print SCRIPT "else\n";
+}
+print SCRIPT "  $dateline\n";
+if (defined $ntpline) {
+    print SCRIPT "fi\n";
+}
+
 # Get list of packages to build and get some ENV vars as well
 my $ptr = pb_get_pkg();
@@ -1698 +1728 @@
 my $pbscript = "$ENV{'PBDESTDIR'}/setupv";
 
+# Deal with date sync.
+my ($ntpline,$dateline) = pb_date_v($vtype);
+
 foreach my $v (@$vm) {
     # Name of the account to deal with for VM/VE
@@ -1703 +1736 @@
     my ($pbac) = pb_conf_get($vtype."login");
     my ($key,$zero0,$zero1,$zero2);
-    my ($vmexist,$vmpid,$ntps);
+    my ($vmexist,$vmpid);
 
     if ($vtype eq "vm") {
@@ -1711 +1744 @@
         my ($vmhost,$vmport,$vmntp) = pb_conf_get("vmhost","vmport","vmntp");
         my $nport = $vmport->{$ENV{'PBPROJ'}};
-        $ntps = $vmntp->{$ENV{'PBPROJ'}};
         $nport = "$pbport" if (defined $pbport);
     
@@ -1777 +1809 @@
 
 # Sync date
-pb_system("/usr/sbin/ntpdate $ntps","Syncing date to $ntps");
-
-EOF
+EOF
+        if (defined $ntpline) {
+            print SCRIPT "if ( -x /usr/sbin/ntpdate ) {\n";
+            print SCRIPT "  system(\"$ntpline\")\n";
+            print SCRIPT "} else {\n";
+        }
+        print SCRIPT "  system(\"$dateline\")\n";
+        if (defined $ntpline) {
+            print SCRIPT "}\n";
+        }
     }
     print SCRIPT << 'EOF';