diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
| commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
| tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /support-files/rpm | |
| parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
| parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
| download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'support-files/rpm')
| -rw-r--r-- | support-files/rpm/server-postin.sh | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh index 9ef9bec3e0d..08b046dc272 100644 --- a/support-files/rpm/server-postin.sh +++ b/support-files/rpm/server-postin.sh @@ -45,6 +45,11 @@ if [ $1 = 1 ] ; then # The user may already exist, make sure it has the proper group nevertheless (BUG#12823) usermod --gid %{mysqld_group} %{mysqld_user} 2> /dev/null || true + # Temporary Workaround for MDEV-11386 - will be corrected in Advance Toolchain 10.0-3 and 8.0-8 + for ldconfig in /opt/at*/sbin/ldconfig; do + test -x $ldconfig && $ldconfig + done + # Change permissions so that the user that will run the MySQL daemon # owns all database files. chown -R %{mysqld_user}:%{mysqld_group} $datadir @@ -69,36 +74,9 @@ fi SETARGETDIR=/etc/selinux/targeted/src/policy SEDOMPROG=$SETARGETDIR/domains/program SECONPROG=$SETARGETDIR/file_contexts/program -if [ -f /etc/redhat-release ] ; then - if grep '\(Red Hat Enterprise Linux ..\|CentOS\) release 4' \ - /etc/redhat-release >/dev/null 2>&1; then - echo - echo - echo 'Notes regarding SELinux on this platform:' - echo '=========================================' - echo - echo 'The default policy might cause server startup to fail because it is ' - echo 'not allowed to access critical files. In this case, please update ' - echo 'your installation. ' - echo - echo 'The default policy might also cause inavailability of SSL related ' - echo 'features because the server is not allowed to access /dev/random ' - echo 'and /dev/urandom. If this is a problem, please do the following: ' - echo - echo ' 1) install selinux-policy-targeted-sources from your OS vendor' - echo ' 2) add the following two lines to '$SEDOMPROG/mysqld.te':' - echo ' allow mysqld_t random_device_t:chr_file read;' - echo ' allow mysqld_t urandom_device_t:chr_file read;' - echo ' 3) cd to '$SETARGETDIR' and issue the following command:' - echo ' make load' - echo - echo - 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/policy/selinux/mariadb.pp - fi - fi + +if [ -x /usr/sbin/semodule ] ; then + /usr/sbin/semodule -i /usr/share/mysql/policy/selinux/mariadb.pp fi if [ -x sbin/restorecon ] ; then |