Changeset 1221

Timestamp:

02/24/11 11:29:33 (2 years ago)

Author:

bruno

Message:

• Fixes again for ntp command which was wrong

File:

• devel/pb/bin/pb (modified) (1 diff)

devel/pb/bin/pb

@@ -2397 +2397 @@
 my ($ntp) = pb_conf_get_if($vtype."ntp");
 my $vntp = $ntp->{$ENV{'PBPROJ'}} if (defined $ntp);
-my $ntpline;
+my $ntpline = undef;
 
 if (defined $vntp) {
-    my ($ntpcmd) = pb_distro_get_param($pbos,pb_conf_get($vtype."ntpcmd"));
-    my $vntpcmd;
-    if (defined $ntpcmd->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) {
-        $vntpcmd = $ntpcmd->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"};
-    } elsif (defined $ntpcmd->{$ENV{'PBPROJ'}}) {
-        $vntpcmd = $ntpcmd->{$ENV{'PBPROJ'}};
-    } else {
-        $vntpcmd = "/bin/true";
-    }
+    # ntp command depends on pbos
+    my $vntpcmd = pb_distro_get_param($pbos,pb_conf_get($vtype."ntpcmd"));
     $ntpline = "sudo $vntpcmd $vntp";
-} else {
-    $ntpline = undef;
 }
 # Force new date to be in the future compared to the date