Diff for /doc/loncapafiles/ntpcheck.piml between versions 1.24 and 1.25

version 1.24, 2014/12/31 21:03:54 version 1.25, 2015/01/01 00:24:17
Line 41  my $NTPD; Line 41  my $NTPD;
 my $checkcmd = 'ps -ef |grep ntp |grep -v grep';  my $checkcmd = 'ps -ef |grep ntp |grep -v grep';
 my $startntpcmd;  my $startntpcmd;
 my $is_running;  my $is_running;
 if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||   if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16')    ||
     ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||      ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18')    ||
     ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||      ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20')    ||
     ('<DIST />' eq 'fedora21') || ('<DIST />' eq 'rhes7')    ||       ('<DIST />' eq 'fedora21') || ('<DIST />' eq 'rhes7')       || 
     ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7')) {      ('<DIST />' eq 'centos7')  || ('<DIST />' eq 'scientific7') ||
       ('<DIST />' eq 'sles12')) {
     $NTPD = 'ntpd';      $NTPD = 'ntpd';
     $startntpcmd = 'systemctl start ntpd.service';      $startntpcmd = 'systemctl start ntpd.service';
     if (!-e '/usr/sbin/ntpd') {      if (!-e '/usr/sbin/ntpd') {
Line 78  if (open(PIPE,'-|',$checkcmd)) { Line 79  if (open(PIPE,'-|',$checkcmd)) {
 }  }
   
 # chkconfig barfs to stderr if the target isn't set up right.  # chkconfig barfs to stderr if the target isn't set up right.
 my $checking_bin;  if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16')    ||
 my $restartchk;      ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18')    ||
 if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {      ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20')    ||
     $checking_bin = '/usr/sbin/sysv-rc-conf';      ('<DIST />' eq 'fedora21') || ('<DIST />' eq 'rhes7')       ||
 } else {      ('<DIST />' eq 'centos7')  || ('<DIST />' eq 'scientific7') ||
     $checking_bin = '/sbin/chkconfig';      ('<DIST />' eq 'sles12')) {
 }  
 if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||   
     ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||  
     ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||  
     ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||  
     ('<DIST />' eq 'scientific7')) {  
     if (!-l "/etc/systemd/system/multi-user.target.wants/ntpd.service") {        if (!-l "/etc/systemd/system/multi-user.target.wants/ntpd.service") {  
         print "**** WARNING: ntpd is not configured to run at boot.  To correct this run:\nsystemctl enable ntpd.service\n";          print "**** WARNING: ntpd is not configured to run at boot.  To correct this run:\nsystemctl enable ntpd.service\n";
     }      }
     exit;      exit;
 } else {  } else {
       my $checking_bin;
       my $restartchk;
       if (('<DIST />' eq 'debian5') || ('<DIST />' eq 'debian6') || ('<DIST />' eq 'ubuntu6') || 
           ('<DIST />' eq 'ubuntu8') || ('<DIST />' eq 'ubuntu10') || ('<DIST />' eq 'ubuntu12') || 
           ('<DIST />' eq 'ubuntu14')) {
           $checking_bin = '/usr/sbin/sysv-rc-conf';
       } else {
           $checking_bin = '/sbin/chkconfig';
       }
     $restartchk = `$checking_bin --list $NTPD 2>/dev/null`;      $restartchk = `$checking_bin --list $NTPD 2>/dev/null`;
     if ($restartchk eq '') {      if ($restartchk eq '') {
         print "**** WARNING: ntpd is either not installed or not configured to run at boot.\n";          print "**** WARNING: ntpd is either not installed or not configured to run at boot.\n";

Removed from v.1.24  
changed lines
  Added in v.1.25


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>