diff options
| author | Otto Kekäläinen <otto@mariadb.org> | 2016-11-26 00:46:12 +0100 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2016-11-26 19:13:26 +0100 |
| commit | 3a6e781ea39b67fabf1a528e6a071215a65f50b0 (patch) | |
| tree | 05c3b25ef785b5b90bfc1536cec0b25f9b75a63d /debian | |
| parent | 618edd4057d7947fccdd2f486d118f8376e95081 (diff) | |
| download | mariadb-git-3a6e781ea39b67fabf1a528e6a071215a65f50b0.tar.gz | |
MDEV-9165: Run chown much faster on the datadir during install/update
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-server-10.2.postinst | 6 | ||||
| -rw-r--r-- | debian/mariadb-server-10.2.preinst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/mariadb-server-10.2.postinst b/debian/mariadb-server-10.2.postinst index b07fc4abf58..9131ca851a7 100644 --- a/debian/mariadb-server-10.2.postinst +++ b/debian/mariadb-server-10.2.postinst @@ -119,7 +119,7 @@ EOF # circumstances as it contains scripts that are executed by root. set +e chown -R 0:0 $mysql_statedir - chown -R mysql $mysql_datadir + find $mysql_datadir ! -uid $(id -u mysql) -print0 | xargs -0 -r chown mysql chown -R mysql:adm $mysql_logdir chmod 2750 $mysql_logdir set -e @@ -144,7 +144,7 @@ EOF bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER set -e - + ## On every reconfiguration the maintenance user is recreated. # # - It is easier to regenerate the password every time but as people @@ -163,7 +163,7 @@ EOF # the old query which always succeeds and then the new which may or may not. # recreate the credentials file if not present or without mysql_upgrade stanza - dc=$mysql_cfgdir/debian.cnf; + dc=$mysql_cfgdir/debian.cnf; if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then pass="`sed -n 's/^[ ]*password *= *// p' $dc | head -n 1`" else diff --git a/debian/mariadb-server-10.2.preinst b/debian/mariadb-server-10.2.preinst index 9c37cba7a9c..f2b8882ab8e 100644 --- a/debian/mariadb-server-10.2.preinst +++ b/debian/mariadb-server-10.2.preinst @@ -199,7 +199,7 @@ fi # The "set +e" is necessary as e.g. a ".journal" of a ext3 partition is # not chgrp'able (#318435). set +e -chown mysql:mysql $mysql_datadir +find $mysql_datadir ! -uid $(id -u mysql) -print0 | xargs -0 -r chown mysql find $mysql_datadir -follow -not -group mysql -print0 2>/dev/null \ | xargs -0 --no-run-if-empty chgrp mysql set -e |