diff options
| author | Andrew Hutchings <andrew@linuxjedi.co.uk> | 2023-01-03 10:48:57 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-01-03 11:45:24 +1100 |
| commit | e51a1d6fc0c105d56c6f05efb3d9fd05b7e4f22f (patch) | |
| tree | 09855f2fe4d24385200030df47a8a34a31f0ef77 | |
| parent | 21223c0461455b4175bae91aee7e3525a51c6d70 (diff) | |
| download | mariadb-git-e51a1d6fc0c105d56c6f05efb3d9fd05b7e4f22f.tar.gz | |
MDEV-30329: mariadb-service-convert resets systemd service to default User=root
If mariadb-service-convert is run and the user variable is unset then
this sets `User=` in `[Service]`, which then tries to run mariadb as
root, which in-turn fails. This only happens when mysqld_safe is missing
which is all the time now. So don't set `User=` if there is no user variable.
Reviewer: Sergei Golubchik <serg@mariadb.org> (in PR #2382)
| -rwxr-xr-x | scripts/mariadb-service-convert | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mariadb-service-convert b/scripts/mariadb-service-convert index 38043733554..ade07e9a336 100755 --- a/scripts/mariadb-service-convert +++ b/scripts/mariadb-service-convert @@ -36,7 +36,7 @@ echo '[Service]' echo -if [[ ( "$user" != "root" && "$user" != "mysql" ) || "${SET_USER}" == 1 ]]; then +if [[ ( ! -z "$user" && "$user" != "root" && "$user" != "mysql" ) || "${SET_USER}" == 1 ]]; then echo User=$user fi |