summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/not-installed4
-rwxr-xr-xdebian/rules12
2 files changed, 14 insertions, 2 deletions
diff --git a/debian/not-installed b/debian/not-installed
index 4bce7f084c2..6924c9ad1a5 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,6 +1,10 @@
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.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@.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/mytop # Mytop is distributed from a separate source package
usr/bin/sst_dump # Use the one from rocksdb-tools package
diff --git a/debian/rules b/debian/rules
index 758831fcdf6..f9f57193343 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,7 +139,11 @@ override_dh_auto_install:
ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
# 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.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@.socket debian/mariadb-server-10.6.mariadb@.socket
+ cp $(BUILDDIR)/support-files/mariadb-extra@.socket debian/mariadb-server-10.6.mariadb-extra@.socket
endif
# Run 'make install' without output since it is uninteresting and
@@ -187,8 +191,12 @@ override_dh_installlogrotate-arch:
dh_installlogrotate --name mysql-server
override_dh_systemd_enable:
- dh_systemd_enable --name=mariadb
- dh_systemd_enable --no-enable --name=mariadb@
+ dh_systemd_enable --name=mariadb mariadb.socket
+ 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
# started which might depend on a running database server.