diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-23 10:44:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-23 10:44:06 +0300 |
| commit | 2b66cd249384221e2a892f655fe84bb58ddc31bd (patch) | |
| tree | ce42f7cfde3d256480b9dbfad496b5164e5490cc /debian | |
| parent | 1002703baa13647b5f43509fccbb79c17ed5c0c7 (diff) | |
| parent | cfbdb5d21072b16ae94c04b6b46db42f500be4c8 (diff) | |
| download | mariadb-git-2b66cd249384221e2a892f655fe84bb58ddc31bd.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-server-10.4.postinst | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/debian/mariadb-server-10.4.postinst b/debian/mariadb-server-10.4.postinst index 4e759a1d54b..0a191e75ef1 100644 --- a/debian/mariadb-server-10.4.postinst +++ b/debian/mariadb-server-10.4.postinst @@ -84,7 +84,7 @@ EOF if [ ! -d "$mysql_datadir" -a ! -L "$mysql_datadir" ]; then mkdir "$mysql_datadir" ; fi if [ ! -d "$mysql_logdir" -a ! -L "$mysql_logdir" ]; then mkdir "$mysql_logdir" ; fi # When creating an ext3 jounal on an already mounted filesystem like e.g. - # /var/lib/mysql, you get a .journal file that is not modifyable by chown. + # /var/lib/mysql, you get a .journal file that is not modifiable by chown. # The mysql_statedir must not be writable by the mysql user under any # circumstances as it contains scripts that are executed by root. set +e @@ -119,9 +119,6 @@ EOF $ERR_LOGGER set -e - # To avoid downgrades. - touch $mysql_statedir/debian-$MAJOR_VER.flag - # On new installations root user can connect via unix_socket. # But on upgrades, scripts rely on debian-sys-maint user and # credentials in /etc/mysql/debian.cnf @@ -177,7 +174,7 @@ EOF ;; esac -db_stop # in case invoke failes +db_stop # in case invoke fails # dh_systemd_start doesn't emit anything since we still ship /etc/init.d/mysql. # Thus MariaDB server is started via init.d script, which in turn redirects to |