From 74a0cde1c612a1549320c5c74146a0763d5916fb Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sat, 18 Jan 2020 02:02:29 +0100
Subject: [PATCH] mysql_install_db always has to pass --user=$user to the
 mysqld

followup for 9d18b624675

strangely enough it only failed upgrade test on eoan
---
 scripts/mysql_install_db.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 0de1fe45014..5226c183d46 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -478,9 +478,9 @@ do
   fi
 done
 
-if test -n "$user" -a "$in_rpm" -eq 0
+if test -n "$user"
 then
-  if test -z "$srcdir"
+  if test -z "$srcdir" -a "$in_rpm" -eq 0
   then
     chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
     chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
@@ -490,14 +490,14 @@ then
         echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
         echo
     fi
-  fi
-  chown $user "$pamtooldir/auth_pam_tool_dir" && \
-  chmod 0700 "$pamtooldir/auth_pam_tool_dir"
-  if test $? -ne 0
-  then
-      echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
-      echo "to the '$user' user. Check that you have the necessary permissions and try again."
-      echo
+    chown $user "$pamtooldir/auth_pam_tool_dir" && \
+    chmod 0700 "$pamtooldir/auth_pam_tool_dir"
+    if test $? -ne 0
+    then
+        echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
+        echo "to the '$user' user. Check that you have the necessary permissions and try again."
+        echo
+    fi
   fi
   args="$args --user=$user"
 fi