diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-23 11:10:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-23 11:10:59 +0300 |
| commit | 2c9f2a4c8c8b32649d78b94f6e62da57e689f2b5 (patch) | |
| tree | 37f3bcee60e98fcd8449c7c3023487bcc94ec4c7 /debian | |
| parent | a6621867e93d310742692bce4d332309999076f8 (diff) | |
| parent | 2b66cd249384221e2a892f655fe84bb58ddc31bd (diff) | |
| download | mariadb-git-2c9f2a4c8c8b32649d78b94f6e62da57e689f2b5.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-server-10.5.postinst | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/debian/mariadb-server-10.5.postinst b/debian/mariadb-server-10.5.postinst index 97828ed15e8..ade898ce819 100644 --- a/debian/mariadb-server-10.5.postinst +++ b/debian/mariadb-server-10.5.postinst @@ -124,7 +124,7 @@ EOF if [ ! -d "$mysql_datadir" ] && [ ! -L "$mysql_datadir" ]; then mkdir -Z "$mysql_datadir" ; fi if [ ! -d "$mysql_logdir" ] && [ ! -L "$mysql_logdir" ]; then mkdir -Z "$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 @@ -161,7 +161,7 @@ EOF # Clean up old flags before setting new one rm -f $mysql_datadir/debian-*.flag # Flag data dir to avoid downgrades - touch "$mysql_datadir/debian-$MAJOR_VER.flag" + touch $mysql_datadir/debian-10.5.flag # initiate databases. Output is not allowed by debconf :-( # This will fail if we are upgrading an existing database; in this case @@ -175,9 +175,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 @@ -251,7 +248,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/mariadb. # Thus MariaDB server is started via init.d script, which in turn redirects to |