Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
99283ba4
Commit
99283ba4
authored
Nov 06, 2015
by
Nirbhay Choubey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-8974: boostrap systemd service for galera is confusing
Fix the conditions for systemd scripts with '@' in path.
parent
125cf485
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
support-files/CMakeLists.txt
support-files/CMakeLists.txt
+12
-7
No files found.
support-files/CMakeLists.txt
View file @
99283ba4
...
@@ -79,16 +79,23 @@ IF(UNIX)
...
@@ -79,16 +79,23 @@ IF(UNIX)
IF
(
HAVE_SYSTEMD
)
IF
(
HAVE_SYSTEMD
)
CONFIGURE_FILE
(
mariadb.service.in
CONFIGURE_FILE
(
mariadb.service.in
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb.service @ONLY
)
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb.service @ONLY
)
IF
(
NOT RPM
)
INSTALL
(
FILES use_galera_new_cluster.conf
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb.service
DESTINATION
${
inst_location
}
/systemd COMPONENT SupportFiles
)
# @ in directory name broken between CMake version 2.8.12.2 and 3.3
# http://public.kitware.com/Bug/view.php?id=14782
IF
(
NOT CMAKE_VERSION VERSION_LESS 3.3.0 OR NOT RPM
)
CONFIGURE_FILE
(
mariadb@.service.in
CONFIGURE_FILE
(
mariadb@.service.in
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb@.service @ONLY
)
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb@.service @ONLY
)
INSTALL
(
FILES use_galera_new_cluster.conf
INSTALL
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb@.service
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb.service
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb@.service
DESTINATION
${
inst_location
}
/systemd COMPONENT SupportFiles
)
DESTINATION
${
inst_location
}
/systemd COMPONENT SupportFiles
)
ENDIF
()
ENDIF
()
IF
(
INSTALL_SYSTEMD_UNITDIR
)
IF
(
INSTALL_SYSTEMD_UNITDIR
)
# @ in directory name broken between CMake version 2.8.12.2 and 3.3
INSTALL
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb.service
DESTINATION
${
INSTALL_SYSTEMD_UNITDIR
}
COMPONENT Server
)
# http://public.kitware.com/Bug/view.php?id=14782
# http://public.kitware.com/Bug/view.php?id=14782
IF
(
NOT CMAKE_VERSION VERSION_LESS 3.3.0 OR NOT RPM
)
IF
(
NOT CMAKE_VERSION VERSION_LESS 3.3.0 OR NOT RPM
)
INSTALL
(
FILES use_galera_new_cluster.conf
INSTALL
(
FILES use_galera_new_cluster.conf
...
@@ -99,8 +106,6 @@ IF(UNIX)
...
@@ -99,8 +106,6 @@ IF(UNIX)
DESTINATION
${
INSTALL_SYSTEMD_UNITDIR
}
COMPONENT Server
)
DESTINATION
${
INSTALL_SYSTEMD_UNITDIR
}
COMPONENT Server
)
ENDIF
()
ENDIF
()
INSTALL
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/mariadb.service
DESTINATION
${
INSTALL_SYSTEMD_UNITDIR
}
COMPONENT Server
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment