Skip to content

Commit

Permalink
mysql_install_db always has to pass --user=$user to the mysqld
Browse files Browse the repository at this point in the history
followup for 9d18b62

strangely enough it only failed upgrade test on eoan
  • Loading branch information
vuvova committed Jan 19, 2020
1 parent 4de3201 commit 74a0cde
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions scripts/mysql_install_db.sh
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit 74a0cde

Please sign in to comment.