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

[raeburn]

raeburn		Mon Aug  5 13:42:44 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /doc/install/linux	install.pl 
  Log:
  - For 2.11
    Backport 1.95
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.45.2.22 doc/install/linux/install.pl:1.45.2.23
--- doc/install/linux/install.pl:1.45.2.22	Thu Aug  1 12:57:23 2024
+++ doc/install/linux/install.pl	Mon Aug  5 13:42:44 2024
@@ -76,7 +76,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.45.2.22 2024/08/01 12:57:23 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.45.2.23 2024/08/05 13:42:44 raeburn Exp $'."\n";
 }
 
 #
@@ -645,7 +645,7 @@
             $proc_owner = 'mysql';
             $process = 'mysqld';
         }
-        if ($1 >= 15) {
+        if ($1 >= 12) {
             $mysqldaemon ='mariadb';
         }
     } elsif ($distro =~ /^suse(\d+)/) {
@@ -731,9 +731,15 @@
                     $uses_systemctl{'ntp'} = 1;
                     $uses_systemctl{'cups'} = 1;
                     $uses_systemctl{'memcached'} = 1;
-                    if (($name eq 'sles') && ($num >= 15)) {
-                        $daemon{'ntp'} = 'chronyd';
-                        $daemon{'mysql'} = 'mariadb';
+                    if ($name eq 'sles') {
+                        if ($num >= 12) {
+                            $daemon{'mysql'} = 'mariadb';
+                        }
+                        if ($num >= 15) {
+                            $daemon{'ntp'} = 'chronyd';
+                        } else {
+                            $daemon{'ntp'} = 'ntpd';
+                        }
                     } else {
                         $daemon{'ntp'} = 'ntpd';
                     }
@@ -763,7 +769,7 @@
             (($distro  =~ /^debian/) && ($version >= 10))) {
             $daemon{'ntp'}    = 'chrony';
         }
-        if (($distro  =~ /^debian/) && ($version >= 11)) {
+        if (($distro  =~ /^debian/) && ($version >= 10)) {
             $daemon{'mysql'} = 'mariadb';
         }
     } elsif ($distro =~ /^fedora(\d+)/) {