Commit 74a0cde1 authored by Sergei Golubchik's avatar Sergei Golubchik

mysql_install_db always has to pass --user=$user to the mysqld

followup for 9d18b624

strangely enough it only failed upgrade test on eoan
parent 4de32015
...@@ -478,9 +478,9 @@ do ...@@ -478,9 +478,9 @@ do
fi fi
done done
if test -n "$user" -a "$in_rpm" -eq 0 if test -n "$user"
then then
if test -z "$srcdir" if test -z "$srcdir" -a "$in_rpm" -eq 0
then then
chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \ chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
...@@ -490,7 +490,6 @@ then ...@@ -490,7 +490,6 @@ then
echo "It must be root, the PAM authentication plugin doesn't work otherwise.." echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
echo echo
fi fi
fi
chown $user "$pamtooldir/auth_pam_tool_dir" && \ chown $user "$pamtooldir/auth_pam_tool_dir" && \
chmod 0700 "$pamtooldir/auth_pam_tool_dir" chmod 0700 "$pamtooldir/auth_pam_tool_dir"
if test $? -ne 0 if test $? -ne 0
...@@ -499,6 +498,7 @@ then ...@@ -499,6 +498,7 @@ then
echo "to the '$user' user. Check that you have the necessary permissions and try again." echo "to the '$user' user. Check that you have the necessary permissions and try again."
echo echo
fi fi
fi
args="$args --user=$user" args="$args --user=$user"
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment