mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 17:54:16 +01:00
MDEV-34191: Make sure that Debian respects systemd disabled
Make sure that Debian respects systemd disabled by bumping to deb compat 11 which is available from Debian 10 and Ubuntu 20.04 and it provides better integration with systemd. Start using dh_installsystemd which is new recommended way in compat 11
This commit is contained in:
parent
70e3c144b3
commit
bccdc72536
2 changed files with 3 additions and 9 deletions
2
debian/compat
vendored
2
debian/compat
vendored
|
@ -1 +1 @@
|
|||
9
|
||||
11
|
||||
|
|
10
debian/rules
vendored
Executable file → Normal file
10
debian/rules
vendored
Executable file → Normal file
|
@ -169,18 +169,12 @@ override_dh_auto_install:
|
|||
mv -v $(TMP)/usr/lib/mysql/plugin/qa_auth_client.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/
|
||||
|
||||
override_dh_installsystemd:
|
||||
dh_systemd_enable --name=mariadb mariadb.service
|
||||
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.socket
|
||||
dh_systemd_enable --no-enable --name=mariadb-extra@ mariadb-extra.socket
|
||||
dh_systemd_enable --no-enable --name=mariadb@ mariadb@.service
|
||||
dh_installsystemd -pmariadb-server mariadb.service
|
||||
|
||||
# Start MariaDB at sequence number 19 before 20 where apache, proftpd etc gets
|
||||
# started which might depend on a running database server.
|
||||
override_dh_installinit-arch:
|
||||
dh_installinit --name=mariadb -- defaults 19 21
|
||||
dh_systemd_start --restart-after-upgrade
|
||||
|
||||
# Use custom server version string variable
|
||||
override_dh_gencontrol:
|
||||
|
@ -191,6 +185,6 @@ override_dh_gencontrol:
|
|||
# white list file only starting from Debian Stretch and Ubuntu Xenial.
|
||||
# To find more, grep build logs for 'but is not installed to anywhere'.
|
||||
%:
|
||||
dh $@ --parallel --with systemd --fail-missing
|
||||
dh $@ --parallel --fail-missing
|
||||
|
||||
# vim: ts=8
|
||||
|
|
Loading…
Add table
Reference in a new issue