--- rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup-3.0.RC6-Update-MySQL-Init-for-Mariadb.patch 2021/01/28 13:49:22 1.1 +++ rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup-3.0.RC6-Update-MySQL-Init-for-Mariadb.patch 2021/01/28 14:22:52 1.2 @@ -77,6 +77,34 @@ diff -urN smeserver-automysqlbackup-3.0. my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'enabled'; our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; +diff -urN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db +--- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db 2021-01-26 15:20:46.062189706 +0000 ++++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db 2021-01-28 12:21:23.087965937 +0000 +@@ -5,7 +5,7 @@ + CONFIG_backup_dir=${BACKUPDIR}_mymaria + CONFIG_mysql_dump_full_schema='no' + CONFIG_db_exclude=( 'performance_schema' 'sys' ) +-CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb55.sock' ++CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock' + # End + _EOF + } +diff -urN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base +--- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base 2021-01-26 15:20:46.064189724 +0000 ++++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base 2021-01-28 12:07:01.492664756 +0000 +@@ -5,10 +5,10 @@ + $my55 = ( ( ( ${'automysqlbackup'}{'Mysql55'} || 'enabled' ) eq "enabled" ) and ( $my55 eq "enabled" ) ) ? "enabled" : "disabled"; + my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; + $my57 = ( ( ( ${'automysqlbackup'}{'Mysql57'} || 'enabled' ) eq "enabled" ) and ( $my57 eq "enabled" ) ) ? "enabled" : "disabled"; +-my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; ++my $mymaria = ${'mariadb'}{'status'} || 'disabled'; + $mymaria = ( ( ( ${'automysqlbackup'}{'Mymaria'} || 'enabled' ) eq "enabled" ) and ( $mymaria eq "enabled") ) ? "enabled" : "disabled"; + +-return '' unless $my51 eq 'enabled'; ++#return '' unless $my51 eq 'enabled'; + my $minutes= ${'automysqlbackup'}{'Minute'}||'1'; + my $hours= ${'automysqlbackup'}{'Hour'}||'3'; + $OUT = "$minutes $hours * * * root "; diff -urN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup 2021-01-26 15:20:46.065189734 +0000 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup 2021-01-26 16:38:28.466035572 +0000