utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -369,6 +369,14 @@ then
     exit 1
   fi
   plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin`
+  # Upstream assumes all plugins will be always installed, but in OpenWrt we can
+  # install a server without plugins if we want to.
+  if test -z "$plugindir"
+  then
+    echo "Could not find plugin directory." >&2
+    echo "Will continue with \"/usr/lib/mariadb/plugin\"." >&2
+    plugindir=/usr/lib/mariadb/plugin
+  fi
   pamtooldir=$plugindir
 # relative from where the script was run for a relocatable install
 elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mariadbd"
@@ -501,7 +509,9 @@ do
   fi
 done
 
-if test -n "$user"
+# There should be no need for this on OpenWrt. If this turns out to be a wrong guess then
+# we can revisit.
+if test -n ""
 then
   if test -z "$srcdir" -a "$in_rpm" -eq 0
   then
@@ -522,6 +532,10 @@ then
         echo
     fi
   fi
+fi
+
+if test -n "$user"
+then
   args="$args --user=$user"
 fi