--- doc/install/linux/install.pl 2016/05/05 03:03:57 1.36 +++ doc/install/linux/install.pl 2016/08/09 15:20:45 1.37 @@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log")) &mt('Stopping execution.')."\n"; exit; } else { - print LOG '$Id: install.pl,v 1.36 2016/05/05 03:03:57 raeburn Exp $'."\n"; + print LOG '$Id: install.pl,v 1.37 2016/08/09 15:20:45 raeburn Exp $'."\n"; } # @@ -454,6 +454,9 @@ sub check_mysql_running { $proc_owner = 'mysql'; $use_systemctl = 1; } + if ($1 >= 22) { + $mysqldaemon ='mariadb'; + } } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) { if ($1 >= 7) { $mysqldaemon ='mariadb'; @@ -574,6 +577,9 @@ sub chkconfig { $uses_systemctl{'memcached'} = 1; $uses_systemctl{'cups'} = 1; } + if ($version >= 22) { + $daemon{'mysql'} = 'mariadb'; + } } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) { my $version = $1; if ($version >= 7) {