mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Merge branch 'migrate_to_bullseye' into bullseye
This commit is contained in:
commit
144126f56a
1 changed files with 12 additions and 2 deletions
|
@ -5,11 +5,11 @@ from moulinette import m18n
|
|||
from yunohost.utils.error import YunohostError
|
||||
from moulinette.utils.log import getActionLogger
|
||||
from moulinette.utils.process import check_output, call_async_output
|
||||
from moulinette.utils.filesystem import read_file
|
||||
from moulinette.utils.filesystem import read_file, rm
|
||||
|
||||
from yunohost.tools import Migration, tools_update, tools_upgrade
|
||||
from yunohost.app import unstable_apps
|
||||
from yunohost.regenconf import manually_modified_files
|
||||
from yunohost.regenconf import manually_modified_files, _force_clear_hashes
|
||||
from yunohost.utils.filesystem import free_space_in_directory
|
||||
from yunohost.utils.packages import (
|
||||
get_ynh_package_version,
|
||||
|
@ -67,6 +67,16 @@ class MyMigration(Migration):
|
|||
|
||||
self.patch_yunohost_conflicts()
|
||||
|
||||
#
|
||||
# Specific tweaking to get rid of custom my.cnf and use debian's default one
|
||||
# (my.cnf is actually a symlink to mariadb.cnf)
|
||||
#
|
||||
|
||||
_force_clear_hashes(["/etc/mysql/my.cnf"])
|
||||
rm("/etc/mysql/mariadb.cnf", force=True)
|
||||
rm("/etc/mysql/my.cnf", force=True)
|
||||
self.apt_install("mariadb-common --reinstall -o Dpkg::Options::='--force-confmiss'")
|
||||
|
||||
#
|
||||
# Main upgrade
|
||||
#
|
||||
|
|
Loading…
Add table
Reference in a new issue