summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2020-08-07 15:10:37 +1000
committerDaniel Black <daniel@mariadb.org>2020-08-08 09:28:12 +1000
commit691191896e971fc5425c64840982e6e1b673af68 (patch)
treefcf8809ab7cd217661c1d3482194fda4b0e6c0fb
parent7482720fb71fd7aa3eab153bbcce6edc6e14de78 (diff)
downloadmariadb-git-bb-10.5-debianpkg-danielblack-pr1600fix.tar.gz
debian: 99-enable-encryption.cnf.preset file, not symlinkbb-10.5-debianpkg-danielblack-pr1600fix
Prevents errors on Windows Linux subsystem. Fix to pr #1600
l---------debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset1
-rw-r--r--debian/mariadb-server-10.5.install1
2 files changed, 1 insertions, 1 deletions
diff --git a/debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset b/debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset
deleted file mode 120000
index 53e8f5c645c..00000000000
--- a/debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset
+++ /dev/null
@@ -1 +0,0 @@
-../../../support-files/rpm/enable_encryption.preset \ No newline at end of file
diff --git a/debian/mariadb-server-10.5.install b/debian/mariadb-server-10.5.install
index 50a60c19169..61215b45a11 100644
--- a/debian/mariadb-server-10.5.install
+++ b/debian/mariadb-server-10.5.install
@@ -3,6 +3,7 @@ debian/additions/debian-start.inc.sh usr/share/mysql
debian/additions/echo_stderr usr/share/mysql
debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
+support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable_encryption.cnf.preset
debian/additions/source_mariadb-10.5.py usr/share/apport/package-hooks
etc/apparmor.d/usr.sbin.mariadbd
etc/security/user_map.conf