diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile
index 321ee70a9..162b0860a 100644
--- a/utils/mariadb/Makefile
+++ b/utils/mariadb/Makefile
@@ -380,7 +380,7 @@ CMAKE_OPTIONS += \
 	-DINSTALL_SQLBENCHDIR="" \
 	-DINSTALL_SUPPORTFILESDIR=share/mariadb \
 	-DINSTALL_UNIX_ADDRDIR=$(MARIADB_SOCKET) \
-	-DMYSQL_DATADIR=/var/lib/mysql \
+	-DMYSQL_DATADIR=/srv/mysql \
 	-DMYSQL_UNIX_ADDR=$(MARIADB_SOCKET) \
 	-DSKIP_TESTS=ON \
 	-DWITH_DEBUG=OFF \
diff --git a/utils/mariadb/files/mysqld.init b/utils/mariadb/files/mysqld.init
index 3e3538907..4f23a01de 100644
--- a/utils/mariadb/files/mysqld.init
+++ b/utils/mariadb/files/mysqld.init
@@ -22,11 +22,7 @@ export HOME="/etc/mysql"
 cd /
 
 mysqld_get_param() {
-	$MYSQLD --print-defaults \
-		| tr " " "\n" \
-		| grep -- "--$1" \
-		| tail -n 1 \
-		| cut -d= -f2
+	/usr/bin/mysqld --help --verbose | sed -n 's|^'"$1"'[[:blank:]]\+||p'
 }
 
 # Checks if a server is running and accessible.