Mirrors/MariaDB-server
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-28 08:10:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Ship mariadb.service and mysql[d].service symlinks

Browse Source 
Create symlinks during configure time and install them. This is
necessary as Alias support from systemd service file was dropped with:
6af0bd6907

* Also ignore the generated symlinks in gitignore
This commit is contained in:
Vicențiu Ciorbaru 2020-04-20 09:58:25 +03:00
parent 27d9986c1b
commit d2f5e82f00
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@ -263,8 +263,9 @@ support-files/config.huge.ini
support-files/config.medium.ini
support-files/config.small.ini
support-files/mariadb.pc
support-files/mariadb@.service
support-files/mariadb.pp
support-files/mariadb.service
support-files/mariadb@.service
support-files/my-huge.cnf
support-files/my-innodb-heavy-4G.cnf
support-files/my-large.cnf
@ -273,14 +274,15 @@ support-files/my-small.cnf
support-files/mysql-log-rotate
support-files/mysql.10.0.11.spec
support-files/mysql.server
support-files/mysql.service
support-files/mysql.spec
support-files/mysqld.service
support-files/mysqld_multi.server
support-files/wsrep.cnf
support-files/wsrep_notify
support-files/policy/selinux/mysqld-safe.pp
support-files/sysusers.conf
support-files/tmpfiles.conf
support-files/mariadb.pp
support-files/wsrep.cnf
support-files/wsrep_notify
tags
tests/async_queries
tests/bug25714

12
support-files/CMakeLists.txt
View File

@ -120,8 +120,15 @@ IF(UNIX)
IF(HAVE_SYSTEMD)
CONFIGURE_FILE(mariadb.service.in
${CMAKE_CURRENT_BINARY_DIR}/mariadb.service @ONLY)
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E create_symlink ./mariadb.service mysql.service
COMMAND ${CMAKE_COMMAND} -E create_symlink ./mariadb.service mysqld.service
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
INSTALL(FILES use_galera_new_cluster.conf
${CMAKE_CURRENT_BINARY_DIR}/mariadb.service
${CMAKE_CURRENT_BINARY_DIR}/mysql.service
${CMAKE_CURRENT_BINARY_DIR}/mysqld.service
DESTINATION ${inst_location}/systemd COMPONENT SupportFiles)
# @ in directory name broken between CMake version 2.8.12.2 and 3.3
@ -134,7 +141,10 @@ IF(UNIX)
ENDIF()
IF(INSTALL_SYSTEMD_UNITDIR)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/mariadb.service
${CMAKE_CURRENT_BINARY_DIR}/mysql.service
${CMAKE_CURRENT_BINARY_DIR}/mysqld.service
DESTINATION ${INSTALL_SYSTEMD_UNITDIR} COMPONENT Server)
# http://public.kitware.com/Bug/view.php?id=14782