diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | support-files/SELinux/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | support-files/SELinux/mariadb.te (renamed from support-files/SELinux/centos6-mariadb.te) | 0 | ||||
| -rw-r--r-- | support-files/rpm/server-postin.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 4d96bfe65a3..4e3d2a1e66e 100644 --- a/.gitignore +++ b/.gitignore @@ -221,7 +221,7 @@ support-files/mysql.spec support-files/mysqld_multi.server support-files/wsrep.cnf support-files/wsrep_notify -support-files/SELinux/centos6-mariadb.pp +support-files/SELinux/mariadb.pp tags tests/async_queries tests/bug25714 diff --git a/support-files/SELinux/CMakeLists.txt b/support-files/SELinux/CMakeLists.txt index e3cdb26ca8f..996d56d6c05 100644 --- a/support-files/SELinux/CMakeLists.txt +++ b/support-files/SELinux/CMakeLists.txt @@ -20,7 +20,7 @@ MARK_AS_ADVANCED(CHECKMODULE SEMODULE_PACKAGE) SET(params DESTINATION ${INSTALL_SUPPORTFILESDIR}/SELinux COMPONENT SupportFiles) IF(CHECKMODULE AND SEMODULE_PACKAGE) - FOREACH(pol centos6-mariadb) + FOREACH(pol mariadb) SET(src ${CMAKE_CURRENT_SOURCE_DIR}/${pol}.te) SET(mod ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${pol}-pp.dir/${pol}.mod) SET(out ${CMAKE_CURRENT_BINARY_DIR}/${pol}.pp) @@ -32,4 +32,4 @@ IF(CHECKMODULE AND SEMODULE_PACKAGE) INSTALL(FILES ${out} ${params}) ENDFOREACH() ENDIF() -INSTALL(FILES centos6-mariadb.te rhel4-mysql.fc rhel4-mysql.te ${params}) +INSTALL(FILES mariadb.te rhel4-mysql.fc rhel4-mysql.te ${params}) diff --git a/support-files/SELinux/centos6-mariadb.te b/support-files/SELinux/mariadb.te index 1d3de52c700..1d3de52c700 100644 --- a/support-files/SELinux/centos6-mariadb.te +++ b/support-files/SELinux/mariadb.te diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh index 377a752824d..d9f06fa43b8 100644 --- a/support-files/rpm/server-postin.sh +++ b/support-files/rpm/server-postin.sh @@ -82,7 +82,7 @@ if [ -f /etc/redhat-release ] ; then fi if grep 'CentOS release 6' /etc/redhat-release >/dev/null 2>&1; then if [ -x /usr/sbin/semodule ] ; then - /usr/sbin/semodule -i /usr/share/mysql/SELinux/centos6-mariadb.pp + /usr/sbin/semodule -i /usr/share/mysql/SELinux/mariadb.pp fi fi fi |