Commit 99f85eec authored by Daniel Black's avatar Daniel Black

MDEV-5536: Debian systemd socket activation

Attempt to follow the rules using dh_system_enable
to install the sockets.

Enable the sockets as opposed to the services by default.
parent 460d480c
etc/columnstore/storagemanager.cnf.example # Copy of etc/columnstore/storagemanager.cnf that is installed etc/columnstore/storagemanager.cnf.example # Copy of etc/columnstore/storagemanager.cnf that is installed
lib/systemd/system/mariadb.service # Installed by rules file lib/systemd/system/mariadb.service # Installed by rules file
lib/systemd/system/mariadb.socket # Installed by rules file
lib/systemd/system/mariadb-extra.socket # Installed by rules file
lib/systemd/system/mariadb@.service # Installed by rules file lib/systemd/system/mariadb@.service # Installed by rules file
lib/systemd/system/mariadb@.socket # Installed by rules file
lib/systemd/system/mariadb-extra@.socket # Installed by rules file
usr/bin/mysql_config # We already have the MariaDB variant usr/bin/mysql_config # We already have the MariaDB variant
usr/bin/mytop # Mytop is distributed from a separate source package usr/bin/mytop # Mytop is distributed from a separate source package
usr/bin/sst_dump # Use the one from rocksdb-tools package usr/bin/sst_dump # Use the one from rocksdb-tools package
......
...@@ -139,7 +139,11 @@ override_dh_auto_install: ...@@ -139,7 +139,11 @@ override_dh_auto_install:
ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS))) ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
# Copy systemd files to a location available for dh_installinit # Copy systemd files to a location available for dh_installinit
cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.6.mariadb.service cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.6.mariadb.service
cp $(BUILDDIR)/support-files/mariadb.socket debian/mariadb-server-10.6.mariadb.socket
cp $(BUILDDIR)/support-files/mariadb-extra.socket debian/mariadb-server-10.6.mariadb-extra.socket
cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.6.mariadb@.service cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.6.mariadb@.service
cp $(BUILDDIR)/support-files/mariadb@.socket debian/mariadb-server-10.6.mariadb@.socket
cp $(BUILDDIR)/support-files/mariadb-extra@.socket debian/mariadb-server-10.6.mariadb-extra@.socket
endif endif
# Run 'make install' without output since it is uninteresting and # Run 'make install' without output since it is uninteresting and
...@@ -187,8 +191,12 @@ override_dh_installlogrotate-arch: ...@@ -187,8 +191,12 @@ override_dh_installlogrotate-arch:
dh_installlogrotate --name mysql-server dh_installlogrotate --name mysql-server
override_dh_systemd_enable: override_dh_systemd_enable:
dh_systemd_enable --name=mariadb dh_systemd_enable --name=mariadb mariadb.socket
dh_systemd_enable --no-enable --name=mariadb@ dh_systemd_enable --name=mariadb-extra mariadb-extra.socket
dh_systemd_enable --no-enable --name=mariadb@ mariadb.socket
dh_systemd_enable --no-enable --name=mariadb-extra@ mariadb-extra.socket
dh_systemd_enable --no-enable --name=mariadb mariadb.service
dh_systemd_enable --no-enable --name=mariadb@ mariadb@.service
# Start MariaDB at sequence number 19 before 20 where apache, proftpd etc gets # Start MariaDB at sequence number 19 before 20 where apache, proftpd etc gets
# started which might depend on a running database server. # started which might depend on a running database server.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment