--- doc/install/linux/install.pl	2011/05/31 03:06:20	1.18
+++ doc/install/linux/install.pl	2011/09/20 20:54:47	1.22
@@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.18 2011/05/31 03:06:20 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.22 2011/09/20 20:54:47 raeburn Exp $'."\n";
 }
 
 #
@@ -191,11 +191,11 @@ sub get_distro {
             $distro = 'rhes'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /CentOS release (\d+)/) {
+        } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
             $distro = 'centos'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /Scientific Linux (SL )?release ([\d.]+) /) {
+        } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
             my $ver = $1;
             $ver =~ s/\.\d+$//;
             $distro = 'scientific'.$ver;
@@ -357,7 +357,7 @@ sub check_required {
     }
     my $gotprereqs = &check_prerequisites($packagecmd,$distro); 
     if ($gotprereqs eq '') {
-        return ($distro,$gotprereqs);
+        return ($distro,$gotprereqs,'',$packagecmd,$updatecmd);
     }
     my $localecmd = &check_locale($distro);
     unless ($localecmd eq '') {
@@ -500,6 +500,17 @@ sub chkconfig {
     my $nrlstr = join('',@norunlevels);
     foreach my $type ('apache','mysql','ntp','cups','memcached') {
         my $service = $daemon{$type};
+        if ($type eq 'ntp') {
+            if ($distro =~ /^(?:fedora)(\d+)/) {
+                my $version = $1;
+                if ($version >= 15) {
+                    if (!-l "/etc/systemd/system/multi-user.target.wants/ntpd.service") {
+                        $needfix{$type} = 'systemctl enable ntpd.service';
+                    }
+                    next;
+                }
+            }
+        }
         my $command = $checker_bin.' --list '.$service.' 2>/dev/null';
         if ($type eq 'cups') { 
             if ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
@@ -1211,7 +1222,7 @@ if ($callsub{'download'}) {
         print &mt('The most recent LON-CAPA release is version: [_1].',$production)."\n".
               &mt('Download the production release? ~[Y/n~]');
         if (&get_user_selection(1)) {
-            $sourcetarball = $production.'tar.gz';
+            $sourcetarball = 'loncapa-'.$production.'.tar.gz';
         }
     }
 } elsif ($filetouse ne '') {