diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2015-09-17 22:16:19 +1000 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-10-12 17:51:49 +0200 |
| commit | 20c2ae39db3dd0ec4c337a9b0bd2bf4481b61e49 (patch) | |
| tree | b7764b7bcbae69da067c1d16592fdde2d82707ab /debian | |
| parent | 92271c78b6c78b1a0248ce5d1c96326b930de610 (diff) | |
| download | mariadb-git-20c2ae39db3dd0ec4c337a9b0bd2bf4481b61e49.tar.gz | |
MDEV-427/MDEV-5713 Add systemd script with notify functionality
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/mariadb-server-10.1.files.in | 1 | ||||
| -rw-r--r-- | debian/mariadb-server-10.1.postinst | 6 | ||||
| -rwxr-xr-x | debian/rules | 9 |
4 files changed, 17 insertions, 0 deletions
diff --git a/debian/control b/debian/control index 91e5fff32c2..f9dd0d72692 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: bison, zlib1g-dev (>= 1:1.1.3-5~), ${MAYBE_LIBCRACK} libjemalloc-dev (>= 3.0.0~) [linux-any] + libsystemd-daemon-dev | libsystemd-dev, dh-systemd Standards-Version: 3.8.2 Homepage: http://mariadb.org/ Vcs-Git: https://github.com/MariaDB/server.git diff --git a/debian/mariadb-server-10.1.files.in b/debian/mariadb-server-10.1.files.in index 2de1adac655..bd5cb55e55f 100644 --- a/debian/mariadb-server-10.1.files.in +++ b/debian/mariadb-server-10.1.files.in @@ -55,6 +55,7 @@ usr/bin/wsrep_sst_mysqldump usr/bin/wsrep_sst_rsync usr/bin/wsrep_sst_xtrabackup usr/bin/wsrep_sst_xtrabackup-v2 +usr/bin/mariadb-system-convert usr/share/doc/mariadb-server-10.1/mysqld.sym.gz usr/share/doc/mariadb-server-10.1/INFO_SRC usr/share/doc/mariadb-server-10.1/INFO_BIN diff --git a/debian/mariadb-server-10.1.postinst b/debian/mariadb-server-10.1.postinst index b30dc5963be..49a426aa9fc 100644 --- a/debian/mariadb-server-10.1.postinst +++ b/debian/mariadb-server-10.1.postinst @@ -276,6 +276,12 @@ if [ "$1" = "configure" ]; then db_go fi + # copy out any mysqld_safe settings + systemd_conf=/etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf + if [ -x /usr/bin/mariadb-service-convert -a ! -f "${systemd_conf}" ]; then + mkdir -p /etc/systemd/system/mariadb.service.d + /usr/bin/mariadb-service-convert > "${systemd_conf}" + fi fi db_stop # in case invoke failes diff --git a/debian/rules b/debian/rules index 17420009379..e16fb6436ca 100755 --- a/debian/rules +++ b/debian/rules @@ -180,6 +180,12 @@ install: build install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_SRC install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_BIN + # systemd helpers + install -m 0755 scripts/mariadb-service-convert $(TMP)/usr/bin/ + install -d $(TMP)/etc/systemd/system/mariadb@bootstrap.service.d/ + install -m 0644 $(BUILDDIR)/support-files/mariadb-bootstrap.conf \ + $(TMP)/etc/systemd/system/mariadb@bootstrap.service.d/wsrep-new-cluster.conf + # mariadb-test mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql @@ -215,7 +221,10 @@ binary-indep: build install dh_installexamples -i dh_installmenu -i dh_installlogrotate -i + dh_systemd_enable -i support-files/mariadb.service + dh_systemd_enable --no-enable support-files/mariadb@.service dh_installinit -i + dh_systemd_start -i --restart-after-upgrade mariadb.service dh_installcron -i dh_installman -i dh_installinfo -i |