-
Notifications
You must be signed in to change notification settings - Fork 195
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
14 additions
and
1 deletion.
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
components/provisioning/warewulf-common/SOURCES/warewulf-common.dbinit.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- warewulf-common-3.7/libexec/wwinit/10-database.init 2017-02-22 09:32:02.000000000 -0800 | ||
+++ warewulf-common-3.7.patch/libexec/wwinit/10-database.init 2017-02-22 21:35:08.000000000 -0800 | ||
@@ -69,6 +69,8 @@ | ||
wwservice_activate mysqld mysql | ||
elif wwpackage_check mariadb-server; then | ||
wwservice_activate mariadb | ||
+ elif wwpackage_check mariadb; then | ||
+ wwservice_activate mysql | ||
else | ||
wwprint "No database package seems to exist for mysql!\n" error | ||
exit 255 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,7 +41,8 @@ BuildRoot: %{?_tmppath}/%{pname}-%{version}-%{release}-root | |
Patch1: warewulf-common.system.patch | ||
# 04/01/16 [email protected] - patch to enable DB transaction handling from WW trunk | ||
Patch2: mysql.r1978.patch | ||
# 05/23/14 [email protected] - alternate package names for SuSE | ||
# 02/22/17 [email protected] - alternate package names for SuSE | ||
Patch3 : warewulf-common.dbinit.patch | ||
%if 0%{?suse_version} | ||
Requires: mysql perl-DBD-mysql | ||
%else | ||
|
@@ -70,6 +71,7 @@ supporting libs. | |
cd %{dname} | ||
%patch1 -p1 | ||
%patch2 -p1 | ||
%patch3 -p1 | ||
|
||
|
||
%build | ||
|