VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-20 16:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to run in post-install

Browse Source
This commit is contained in:
Ilia Ross
2024-11-26 20:15:23 +02:00
parent cd0cb2ace3
commit a3799b2e91
2 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mysql/mysql-lib.pl
View File

@ -76,51 +76,6 @@ use DBI;
EOF
}
# Check if we have to use a new MariaDB commands
if (!$config{'mysql_mariadb_updated'}) {
my ($mversion, $mvariant) = &get_remote_mysql_variant();
if ($mvariant =~ /mariadb/i) {
if (&compare_version_numbers($mversion, "10.5") > 0) {
my $config_updated;
foreach my $key (grep { /^mysql(?!_)/ } keys %config) {
my $cmd = $config{$key};
next if ($cmd !~ /^\//);
# Check if symlink
if (-l $cmd) {
my $target = readlink($cmd);
my $dir = $cmd =~ s|/[^/]+$||r;
if ($target =~ /^mariadb/i) {
# Update config if symlinked
# to mariadb
$config{$key} = "$dir/$target";
$config_updated++;
}
}
# If command doesn't exist, try mariadb version
else {
my $mariadb_cmd = $cmd;
$mariadb_cmd =~ s/mysql(\w+)/mariadb-$1/;
if (&has_command($mariadb_cmd)) {
$config{$key} = $mariadb_cmd;
$config_updated++;
}
}
}
if ($config_updated) {
# Update start stop commands
foreach my $key ('start_cmd', 'stop_cmd') {
next if ($config{$key} !~ /systemctl/);
$config{$key} =~
s/mysql(?:\.service)?$/mariadb/;
}
# Update config file
$config{'mysql_mariadb_updated'} = $mversion;
&save_module_config();
}
}
}
}
# Fix text if we're running MariaDB
sub fix_mysql_text
{

45
mysql/postinstall.pl
View File

@ -8,4 +8,49 @@ if ($mysql_version && $mysql_version >= 0) {
&save_mysql_version($mysql_version);
&create_module_info_overrides();
}
# Check if we have to use a new MariaDB commands
if (!$config{'mysql_mariadb_updated'}) {
my ($mversion, $mvariant) = &get_remote_mysql_variant();
if ($mvariant =~ /mariadb/i) {
if (&compare_version_numbers($mversion, "10.5") > 0) {
my $config_updated;
foreach my $key (grep { /^mysql(?!_)/ } keys %config) {
my $cmd = $config{$key};
next if ($cmd !~ /^\//);
# Check if symlink
if (-l $cmd) {
my $target = readlink($cmd);
my $dir = $cmd =~ s|/[^/]+$||r;
if ($target =~ /^mariadb/i) {
# Update config if symlinked
# to mariadb
$config{$key} = "$dir/$target";
$config_updated++;
}
}
# If command doesn't exist, try mariadb version
else {
my $mariadb_cmd = $cmd;
$mariadb_cmd =~ s/mysql(\w+)/mariadb-$1/;
if (&has_command($mariadb_cmd)) {
$config{$key} = $mariadb_cmd;
$config_updated++;
}
}
}
if ($config_updated) {
# Update start stop commands
foreach my $key ('start_cmd', 'stop_cmd') {
next if ($config{$key} !~ /systemctl/);
$config{$key} =~
s/mysql(?:\.service)?$/mariadb/;
}
# Update config file
$config{'mysql_mariadb_updated'} = $mversion;
&save_module_config();
}
}
}
}
}