[LON-CAPA-cvs] cvs: doc /install/linux install.pl

[raeburn]

raeburn		Tue May 24 00:17:37 2011 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Correction to location of memcached binary for Debian/Ubuntu.
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.15 doc/install/linux/install.pl:1.16
--- doc/install/linux/install.pl:1.15	Mon May 23 23:45:39 2011
+++ doc/install/linux/install.pl	Tue May 24 00:17:37 2011
@@ -72,7 +72,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.15 2011/05/23 23:45:39 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.16 2011/05/24 00:17:37 raeburn Exp $'."\n";
 }
 
 #
@@ -699,10 +699,10 @@
             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;
                     }