Commit 3a069644 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-33852 start the server after deb installation

and fix installation of mysql.service on buster

followup for ec09c034
parent a6b2f820
...@@ -9,12 +9,12 @@ etc/logrotate.d/mariadb ...@@ -9,12 +9,12 @@ etc/logrotate.d/mariadb
etc/security/user_map.conf etc/security/user_map.conf
lib/*/security/pam_user_map.so lib/*/security/pam_user_map.so
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
lib/systemd/system/mariadb-extra@.socket
lib/systemd/system/mariadb.service
lib/systemd/system/mariadb@.service
lib/systemd/system/mariadb@.socket
lib/systemd/system/mysql.service lib/systemd/system/mysql.service
lib/systemd/system/mysqld.service lib/systemd/system/mysqld.service
usr/share/mysql/systemd/mariadb-extra@.socket
usr/share/mysql/systemd/mariadb.service
usr/share/mysql/systemd/mariadb@.service
usr/share/mysql/systemd/mariadb@.socket
support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
usr/bin/aria_chk usr/bin/aria_chk
usr/bin/aria_dump_log usr/bin/aria_dump_log
......
...@@ -5,11 +5,7 @@ etc/mysql/mariadb.conf.d/enable_encryption.preset # Debian packaging uses files ...@@ -5,11 +5,7 @@ etc/mysql/mariadb.conf.d/enable_encryption.preset # Debian packaging uses files
etc/mysql/mariadb.conf.d/mysql-clients.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/ etc/mysql/mariadb.conf.d/mysql-clients.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/
etc/mysql/mariadb.conf.d/server.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/ etc/mysql/mariadb.conf.d/server.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/
lib/systemd/system/mariadb-extra.socket # Installed by rules file lib/systemd/system/mariadb-extra.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.socket # Installed by rules file
lib/systemd/system/mariadb@.service # Installed by rules file
lib/systemd/system/mariadb@.socket # Installed by rules file
usr/bin/mariadb-embedded # Shipping the embedded server in distro packaging does not make sense usr/bin/mariadb-embedded # Shipping the embedded server in distro packaging does not make sense
usr/bin/mysql_config # Debian packaging has mysql_config as symlink to mariadb_config usr/bin/mysql_config # Debian packaging has mysql_config as symlink to mariadb_config
usr/bin/mysql_embedded # Symlink to mariadb-embedded which is intentionally not included usr/bin/mysql_embedded # Symlink to mariadb-embedded which is intentionally not included
...@@ -64,6 +60,10 @@ usr/share/mysql/policy/selinux/README # In MariaDB we don't want to use SELinux ...@@ -64,6 +60,10 @@ usr/share/mysql/policy/selinux/README # In MariaDB we don't want to use SELinux
usr/share/mysql/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment usr/share/mysql/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment
usr/share/mysql/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment usr/share/mysql/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment
usr/share/mysql/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment usr/share/mysql/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment
usr/share/mysql/systemd/mariadb-extra@.socket # Installed by rules file
usr/share/mysql/systemd/mariadb.service # Installed by rules file
usr/share/mysql/systemd/mariadb@.service # Installed by rules file
usr/share/mysql/systemd/mariadb@.socket # Installed by rules file
usr/share/mysql/systemd/mysql.service # Installed by rules file usr/share/mysql/systemd/mysql.service # Installed by rules file
usr/share/mysql/systemd/mysqld.service # Installed by rules file usr/share/mysql/systemd/mysqld.service # Installed by rules file
usr/share/mysql/systemd/use_galera_new_cluster.conf usr/share/mysql/systemd/use_galera_new_cluster.conf
...@@ -179,7 +179,7 @@ override_dh_installsystemd: ...@@ -179,7 +179,7 @@ override_dh_installsystemd:
# 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.
override_dh_installinit-arch: override_dh_installinit-arch:
dh_installinit --name=mariadb --no-start -- defaults 19 21 dh_installinit --name=mariadb -- defaults 19 21
dh_systemd_start --restart-after-upgrade dh_systemd_start --restart-after-upgrade
# Use custom server version string variable # Use custom server version string variable
......
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