!16 modify service file

Merge pull request !16 from hy/master
This commit is contained in:
openeuler-ci-bot 2020-01-20 09:44:50 +08:00 committed by Gitee
commit 2a7b518938
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 22caf578e446809de75555ec8252f09da50c8db1 Mon Sep 17 00:00:00 2001
From: eulerstorage <eulerstorage@huawei.com>
Date: Sun, 19 Jan 2020 22:54:38 +0800
Subject: [PATCH] add mysql install db command
---
support-files/mariadb.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index 8d43b6d..56ccb1a 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -73,7 +73,7 @@ ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
&& systemctl set-environment _WSREP_START_POSITION=$VAR || exit 1"
# Needed to create system tables etc.
-# ExecStartPre=@scriptdir@/mysql_install_db -u mysql
+ExecStartPre=@scriptdir@/mysql_install_db --user="mysql" --skip-test-db
# Start main service
# MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb.service.d/MY_SPECIAL.conf
--
1.8.3.1

View File

@ -2,7 +2,7 @@
Name: mariadb
Version: 10.3.9
Release: 6
Release: 7
Epoch: 3
Summary: One of the most popular database servers
License: GPLv2 with exceptions and LGPLv2 and BSD
@ -11,6 +11,7 @@ URL: http://mariadb.org
Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz
Patch9000: 9000-disable-some-unstable-testcases.patch
Patch9001: 9001-add-install-db-command.patch
BuildRequires: selinux-policy-devel, cmake, gcc-c++
BuildRequires: systemd, systemd-devel
@ -596,6 +597,9 @@ fi
%changelog
* Sun Jan 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 3:10.3.9-7
- Add mysql_install_db command in service file
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 3:10.3.9-6
- Add my.cnf file