database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-37197 RPM: Install PAM modules and systemd units in /usr/lib (not /lib)

Browse Source 
Since Fedora 17 and about 2012, the directory
/lib{,64} has been a symlink to /usr/lib{,64}.

This has been verified on RHEL8, 9, 10, Fedora
, OpenEuler.

SLES1507, OpenSUSE 1506 and earlier (there is no
OpenSUSE 1507) had the old location for pam but
since their 1600 version they are now standardised.

References:
- https://fedoraproject.org/wiki/Features/UsrMove
- https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/
This commit is contained in:
Daniel Black
2026-04-21 15:35:09 +10:00
parent 0b2d9bd0cd
commit 34aac090f2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/install_layout.cmake
View File

@@ -164,7 +164,12 @@ SET(INSTALL_SYSTEMD_UNITDIR_RPM "/usr/lib/systemd/system")
SET(INSTALL_SYSTEMD_SYSUSERSDIR_RPM "/usr/lib/sysusers.d")
SET(INSTALL_SYSTEMD_TMPFILESDIR_RPM "/usr/lib/tmpfiles.d")
SET(INSTALL_RUNDATADIR_RPM "/run/mariadb")
SET(INSTALL_PAMDIR_RPM "/${INSTALL_LIBDIR_RPM}/security")
SET(INSTALL_PAMDIR_RPM "/usr/${INSTALL_LIBDIR_RPM}/security")
IF(RPM MATCHES "^(opensuse|sles)([0-9]+)$")
IF(CMAKE_MATCH_2 LESS_EQUAL 1507)
SET(INSTALL_PAMDIR_RPM "/${INSTALL_LIBDIR_RPM}/security")
ENDIF()
ENDIF()
SET(INSTALL_PAMDATADIR_RPM "/etc/security")
#