You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
1.1 KiB

  1. --- a/scripts/mysql_install_db.sh
  2. +++ b/scripts/mysql_install_db.sh
  3. @@ -358,6 +358,14 @@ then
  4. exit 1
  5. fi
  6. plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin`
  7. + # Upstream assumes all plugins will be always installed, but in OpenWrt we can
  8. + # install a server without plugins if we want to.
  9. + if test -z "$plugindir"
  10. + then
  11. + echo "Could not find plugin directory." >&2
  12. + echo "Will continue with \"/usr/lib/mariadb/plugin\"." >&2
  13. + plugindir=/usr/lib/mariadb/plugin
  14. + fi
  15. pamtooldir=$plugindir
  16. # relative from where the script was run for a relocatable install
  17. elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld"
  18. @@ -477,7 +485,9 @@ do
  19. fi
  20. done
  21. -if test -n "$user"
  22. +# There should be no need for this on OpenWrt. If this turns out to be a wrong guess then
  23. +# we can revisit.
  24. +if test -n ""
  25. then
  26. if test -z "$srcdir" -a "$in_rpm" -eq 0
  27. then
  28. @@ -498,6 +508,10 @@ then
  29. echo
  30. fi
  31. fi
  32. +fi
  33. +
  34. +if test -n "$user"
  35. +then
  36. args="$args --user=$user"
  37. fi