Commit ebb8ace8 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

MariaDB should not expect PAM to be installed; there should be no root...

MariaDB should not expect PAM to be installed; there should be no root password by default for temporary installation
parent 90b44706
...@@ -27,6 +27,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config ...@@ -27,6 +27,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
mv -v /etc/gshadow /data/etc/gshadow mv -v /etc/gshadow /data/etc/gshadow
ln -sv /data/etc/gshadow /etc/gshadow ln -sv /data/etc/gshadow /etc/gshadow
tar xf mariadb-10.4.6.tar.gz tar xf mariadb-10.4.6.tar.gz
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-no_pam.patch
cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
mkdir mariadb-10.4.6/build mkdir mariadb-10.4.6/build
cd mariadb-10.4.6/build && cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_LAYOUT=DEB -DINSTALL_SYSCONF2DIR=/etc/my.cnf.d -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DTOKUDB_OK=0 -DWITH_WSREP=ON -DWITH_INNODB_DISALLOW_WRITES=ON .. cd mariadb-10.4.6/build && cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_LAYOUT=DEB -DINSTALL_SYSCONF2DIR=/etc/my.cnf.d -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DTOKUDB_OK=0 -DWITH_WSREP=ON -DWITH_INNODB_DISALLOW_WRITES=ON ..
...@@ -153,6 +154,7 @@ client: ...@@ -153,6 +154,7 @@ client:
swapon swap swapon swap
tar xf mariadb-10.4.6.tar.gz tar xf mariadb-10.4.6.tar.gz
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-no_pam.patch
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-without_server_fix.patch patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-without_server_fix.patch
cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
mkdir mariadb-10.4.6/build mkdir mariadb-10.4.6/build
...@@ -177,6 +179,7 @@ temporary: ...@@ -177,6 +179,7 @@ temporary:
swapon swap swapon swap
tar xf mariadb-10.4.6.tar.gz tar xf mariadb-10.4.6.tar.gz
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-no_pam.patch
cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
mkdir mariadb-10.4.6/build mkdir mariadb-10.4.6/build
cd mariadb-10.4.6/build && cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/build/usr -DINSTALL_DOCDIR=share/doc/mariadb-10.4.6 -DINSTALL_DOCREADMEDIR=share/doc/mariadb-10.4.6 -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_MYSQLTESTDIR=share/mysql/test -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SBINDIR=sbin -DINSTALL_SCRIPTDIR=bin -DINSTALL_SQLBENCHDIR=share/mysql/bench -DINSTALL_SUPPORTFILESDIR=share/mysql -DMYSQL_DATADIR=/build/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysql.sock -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DTOKUDB_OK=0 .. cd mariadb-10.4.6/build && cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/build/usr -DINSTALL_DOCDIR=share/doc/mariadb-10.4.6 -DINSTALL_DOCREADMEDIR=share/doc/mariadb-10.4.6 -DINSTALL_MANDIR=share/man -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_MYSQLTESTDIR=share/mysql/test -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SBINDIR=sbin -DINSTALL_SCRIPTDIR=bin -DINSTALL_SQLBENCHDIR=share/mysql/bench -DINSTALL_SUPPORTFILESDIR=share/mysql -DMYSQL_DATADIR=/build/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysql.sock -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DTOKUDB_OK=0 ..
...@@ -189,5 +192,9 @@ temporary: ...@@ -189,5 +192,9 @@ temporary:
/build/usr/bin/mysql_install_db --basedir=/build/usr --datadir=/build/var/lib/mysql --user=nobody /build/usr/bin/mysql_install_db --basedir=/build/usr --datadir=/build/var/lib/mysql --user=nobody
install -v -m755 -o nobody -g nobody -d /build/run/mysqld install -v -m755 -o nobody -g nobody -d /build/run/mysqld
/build/usr/bin/mysqld_safe --nowatch --user=root && sleep 15
/build/usr/bin/mysqladmin password ''
/build/usr/bin/mysqladmin -p shutdown
swapoff swap swapoff swap
rm -rf swap rm -rf swap
diff -uNr mariadb-10.4.6/scripts/mysql_install_db.sh mariadb-10.4.6-no_pam/scripts/mysql_install_db.sh
--- mariadb-10.4.6/scripts/mysql_install_db.sh 2019-06-18 07:30:32.000000000 +0930
+++ mariadb-10.4.6-no_pam/scripts/mysql_install_db.sh 2019-10-19 20:00:32.333667865 +1030
@@ -467,13 +467,6 @@
if test -n "$user"
then
- chown $user "$pamtooldir/auth_pam_tool_dir"
- if test $? -ne 0
- then
- echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
- echo " to the '$user' user. Check that you have the necessary permissions and try again."
- exit 1
- fi
if test -z "$srcdir"
then
chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment