Skip to content
/ server Public

Commit 943546a

Browse files
committed
Install PAM modules and systemd units from /lib to /usr/lib
Since Fedora 17 and about 2012, the directory /lib has been a symlink to /usr/lib. Debian started a similar migration in 2019. Nowadays all major Linux distributions have a merged /usr, and the canonical location for files should be /usr/lib instead of just /lib. The location of PAM modules and systemd files is the last remaining part in MariaDB to fully complete the usr merge migration. Stable releases should not move files around, so target MariaDB 11.8 as the first release to have the /usr merge fully completed. References: - https://fedoraproject.org/wiki/Features/UsrMove - https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.en.html#a-merged-usr-is-now-required - https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/
1 parent 49f351f commit 943546a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/install_layout.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ SET(INSTALL_SUPPORTFILESDIR_DEB "share/mariadb")
194194
SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql")
195195

196196
SET(INSTALL_UNIX_ADDRDIR_DEB "/run/mysqld/mysqld.sock")
197-
SET(INSTALL_SYSTEMD_UNITDIR_DEB "/lib/systemd/system")
197+
SET(INSTALL_SYSTEMD_UNITDIR_DEB "/usr/lib/systemd/system")
198198
SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB "/usr/lib/sysusers.d")
199199
SET(INSTALL_SYSTEMD_TMPFILESDIR_DEB "/usr/lib/tmpfiles.d")
200-
SET(INSTALL_PAMDIR_DEB "/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
200+
SET(INSTALL_PAMDIR_DEB "/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
201201
SET(INSTALL_PAMDATADIR_DEB "/etc/security")
202202

203203
#

0 commit comments

Comments
 (0)