From af729b3b898824c9d39ccb9cf2b9344a91f1fc31 Mon Sep 17 00:00:00 2001 From: Lena Voytek Date: Wed, 9 Sep 2026 16:58:46 -0400 Subject: [PATCH] Update default rundatadir for debian to be /run/mariadbd Move mariadbd's runtime data directory in Debian from /run/mysqld to /run/mariadbd. --- cmake/install_layout.cmake | 2 +- debian/additions/mariadb.cnf | 2 +- debian/additions/mariadb.conf.d/50-server.cnf | 2 +- debian/mariadb-server.logcheck.ignore.paranoid | 4 ++-- debian/mariadb-server.logcheck.ignore.server | 2 +- debian/mariadb-server.logcheck.ignore.workstation | 2 +- debian/mariadb-server.mariadb.init | 2 +- debian/mariadb-server.postrm | 2 +- support-files/mariadb@.service.in | 2 +- support-files/policy/apparmor/usr.sbin.mysqld | 5 +++++ 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 0911fc94ea99b..3f853e4cc804a 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -199,7 +199,7 @@ SET(INSTALL_SUPPORTFILESDIR_DEB "share/mariadb") # SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql") -SET(INSTALL_RUNDATADIR_DEB "/run/mysqld") +SET(INSTALL_RUNDATADIR_DEB "/run/mariadbd") SET(INSTALL_UNIX_ADDRDIR_DEB "${INSTALL_RUNDATADIR_DEB}/mysqld.sock") SET(INSTALL_SYSTEMD_UNITDIR_DEB "/usr/lib/systemd/system") SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB "/usr/lib/sysusers.d") diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf index 95038f0496f16..b9cb034e38e29 100644 --- a/debian/additions/mariadb.cnf +++ b/debian/additions/mariadb.cnf @@ -22,7 +22,7 @@ [client-server] # Port or socket location where to connect # port = 3306 -socket = /run/mysqld/mysqld.sock +socket = /run/mariadbd/mysqld.sock # Import all .cnf files from configuration directory !includedir /etc/mysql/conf.d/ diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf index 722dc6b5ec87a..f5cfc79afc7c6 100644 --- a/debian/additions/mariadb.conf.d/50-server.cnf +++ b/debian/additions/mariadb.conf.d/50-server.cnf @@ -13,7 +13,7 @@ # #user = mysql -pid-file = /run/mysqld/mysqld.pid +pid-file = /run/mariadbd/mysqld.pid basedir = /usr #datadir = /var/lib/mysql #tmpdir = /tmp diff --git a/debian/mariadb-server.logcheck.ignore.paranoid b/debian/mariadb-server.logcheck.ignore.paranoid index 407d40632701c..97825d878bf70 100644 --- a/debian/mariadb-server.logcheck.ignore.paranoid +++ b/debian/mariadb-server.logcheck.ignore.paranoid @@ -1,8 +1,8 @@ -/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$ +/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/(mariadbd|mysqld)/mysqld.sock' exists\!$ /etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ mariadbd\[[0-9]+\]: $ -mariadbd\[[0-9]+\]: Version: .* socket: '/run/mysqld/mysqld.sock' port: 3306$ +mariadbd\[[0-9]+\]: Version: .* socket: '/run/(mariadbd|mysqld)/mysqld.sock' port: 3306$ mariadbd\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ mysqld_safe\[[0-9]+\]: started$ usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ diff --git a/debian/mariadb-server.logcheck.ignore.server b/debian/mariadb-server.logcheck.ignore.server index 7db321a02d40c..c4b4dee513a4c 100644 --- a/debian/mariadb-server.logcheck.ignore.server +++ b/debian/mariadb-server.logcheck.ignore.server @@ -1,5 +1,5 @@ /etc/init.d/mariadb\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$ +/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/(mariadbd|mysqld)/mysqld.sock' exists\!$ /etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ mariadbd\[[0-9]+\]: ?$ diff --git a/debian/mariadb-server.logcheck.ignore.workstation b/debian/mariadb-server.logcheck.ignore.workstation index 7db321a02d40c..c4b4dee513a4c 100644 --- a/debian/mariadb-server.logcheck.ignore.workstation +++ b/debian/mariadb-server.logcheck.ignore.workstation @@ -1,5 +1,5 @@ /etc/init.d/mariadb\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$ +/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/(mariadbd|mysqld)/mysqld.sock' exists\!$ /etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ mariadbd\[[0-9]+\]: ?$ diff --git a/debian/mariadb-server.mariadb.init b/debian/mariadb-server.mariadb.init index 765640327d19d..6e8116b07dfec 100644 --- a/debian/mariadb-server.mariadb.init +++ b/debian/mariadb-server.mariadb.init @@ -171,7 +171,7 @@ case "${1:-''}" in log_end_msg 0 else # Could be removed during boot - test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld + test -e /run/mariadbd || install -m 755 -o mysql -g root -d /rrun/mariadbd # Start MariaDB! /usr/bin/mariadbd-safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER & diff --git a/debian/mariadb-server.postrm b/debian/mariadb-server.postrm index 601fe87f7e9ad..d6dc55cd075da 100644 --- a/debian/mariadb-server.postrm +++ b/debian/mariadb-server.postrm @@ -48,7 +48,7 @@ then # /var/lib/mysql is a mount point rmdir --ignore-fail-on-non-empty /var/lib/mysql || true fi - rm -rf /run/mysqld # this directory is created by the init script, don't leave behind + rm -rf /run/mariadbd # this directory is created by the init script, don't leave behind userdel mysql || true fi diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index 5ae44a8eeb95d..121b1321aa985 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -100,7 +100,7 @@ # in configuration between instances. # # [Service] -# Environment=MYSQLD_MULTI_INSTANCE="--socket=/run/mysqld/%I.sock \ +# Environment=MYSQLD_MULTI_INSTANCE="--socket=/run/mariadbd/%I.sock \ # --datadir=/var/lib/mysqld-multi/%I \ # --skip-networking" # diff --git a/support-files/policy/apparmor/usr.sbin.mysqld b/support-files/policy/apparmor/usr.sbin.mysqld index c144fb2e777a6..0763658c50891 100644 --- a/support-files/policy/apparmor/usr.sbin.mysqld +++ b/support-files/policy/apparmor/usr.sbin.mysqld @@ -40,6 +40,8 @@ /etc/nsswitch.conf r, /etc/passwd r, /etc/services r, + /run/mariadbd/mysqld.pid w, + /run/mariadbd/mysqld.sock w, /run/mysqld/mysqld.pid w, /run/mysqld/mysqld.sock w, /sys/devices/system/cpu/ r, @@ -55,6 +57,8 @@ /var/log/mysql.log rw, /var/log/mysql/ r, /var/log/mysql/* rw, + /run/mariadbd/mysqld.pid w, + /run/mariadbd/mysqld.sock w, /run/mysqld/mysqld.pid w, /run/mysqld/mysqld.sock w, @@ -131,6 +135,7 @@ /proc/*/net/* r, /proc/locks r, /proc/sys/net/ipv4/ip_local_port_range r, + /run/mariadbd/mysqld.sock rw, /run/mysqld/mysqld.sock rw, /sbin/ip rix, /usr/bin/basename rix,