Skip to content

Commit 19cffe6

Browse files
committed
MDEV-6284: Revert commit af03ba8 partially for systemd
This version of Debian packaging does not yet install systemd scripts, so revert that part to the CMakeLists.txt based hack.
1 parent f63799d commit 19cffe6

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,12 @@ CONFIGURE_FILE(
435435
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
436436
${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
437437

438+
IF(DEB)
439+
CONFIGURE_FILE(
440+
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.install.in
441+
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.install)
442+
ENDIF(DEB)
443+
438444
# Handle the "INFO_*" files.
439445
INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
440446
# Source: This can be done during the cmake phase, all information is

debian/mariadb-server-10.2.install renamed to debian/mariadb-server-10.2.install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ usr/share/mysql/mysql_system_tables.sql
6363
usr/share/mysql/mysql_system_tables_data.sql
6464
usr/share/mysql/mysql_test_data_timezone.sql
6565
usr/share/mysql/wsrep_notify
66+
@SYSTEMD_DEB_FILES@

debian/rules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,10 @@ override_dh_installlogrotate-arch:
156156
# Start mysql at sequence number 19 before 20 where apache, proftpd etc gets
157157
# started which might depend on a running database server.
158158
override_dh_installinit-arch:
159+
if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.2/lib/systemd/system/mariadb.service ]; then dh_systemd_enable -pmariadb-server-10.2 mariadb.service; fi
160+
if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.2/lib/systemd/system/mariadb@.service ]; then dh_systemd_enable --no-enable -pmariadb-server-10.2 mariadb@.service; fi
159161
dh_installinit --name=mysql -- defaults 19 21
162+
if [ -x /usr/bin/dh_systemd_start -a -f debian/mariadb-server-10.2/lib/systemd/system/mariadb.service ]; then dh_systemd_start -pmariadb-server-10.2 --restart-after-upgrade mariadb.service; fi
160163

161164
override_dh_installcron-arch:
162165
dh_installcron --name mysql-server

0 commit comments

Comments
 (0)