--- doc/install/linux/install.pl 2011/05/22 11:56:15 1.14 +++ doc/install/linux/install.pl 2011/05/24 00:17:37 1.16 @@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log")) &mt('Stopping execution.')."\n"; exit; } else { - print LOG '$Id: install.pl,v 1.14 2011/05/22 11:56:15 raeburn Exp $'."\n"; + print LOG '$Id: install.pl,v 1.16 2011/05/24 00:17:37 raeburn Exp $'."\n"; } # @@ -660,7 +660,7 @@ sub chkapache { } } elsif ($distro =~ /^fedora(\d+)$/) { if ($1 > 10) { - $conftype = 'new/httpd.conf'; + $configfile = 'new/httpd.conf'; } } if (!-e "$instdir/centos-rhes-fedora-sl/$configfile") { @@ -699,10 +699,10 @@ sub chksrvcs { close(PIPE); if ($daemonrunning) { if ($service eq 'memcached') { - my $cmd = '/usr/sbin/memcached'; - if ($distro =~ /^centos|fedora|scientific|rhes/) { - $cmd = '/usr/bin/memcached'; - } + my $cmd = '/usr/bin/memcached'; + if ($distro =~ /^(suse|sles)/) { + $cmd = '/usr/sbin/memcached'; + } unless ($daemonrunning =~ m{^www[^/]+\Q$cmd -m 400 -v\E$}) { $stopsrvcs{$service} = 1; }