Changeset 1598


Ignore:
Timestamp:
May 26, 2012, 2:43:56 AM (8 years ago)
Author:
Bruno Cornec
Message:
  • pb now also build itself in a debian 6 VM again (ntp may error)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r1597 r1598  
    26852685my $ntpline = undef;
    26862686
    2687 if (defined $vntp) {
     2687if ((defined $vntp) && ($vntp !~ /^\s*$/)) {
    26882688    # ntp command depends on pbos
    26892689    my $vntpcmd = pb_distro_get_param($pbos,pb_conf_get($vtype."ntpcmd"));
     
    32703270    next if (/^$pbac->{$ENV{'PBPROJ'}}\\s+/);
    32713271    next if (/^Defaults:$pbac->{$ENV{'PBPROJ'}}\\s+/);
    3272     next if (/^Defaults:root \!requiretty/);
    3273     next if (/^Defaults:root env_keep/);
     3272    next if (/^Defaults:root\\s+\!requiretty/);
     3273    next if (/^Defaults:root\\s+env_keep/);
    32743274EOF
    32753275    print SCRIPT << 'EOF';
     
    33233323        # Sync date
    33243324        # do it after sudoers is setup
    3325         print SCRIPT "pb_system(\"$ntpline\");\n";
     3325        print SCRIPT "pb_system(\"$ntpline\",\"Setting up time\",\"mayfail\");\n";
    33263326    }
    33273327    # We may need a proxy configuration. Get it from the local env
Note: See TracChangeset for help on using the changeset viewer.