diff options
| author | Daniel Black <daniel@mariadb.org> | 2020-08-07 15:10:37 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-08-08 14:06:33 +1000 |
| commit | 2b6dd87b2c137229863f5eb0128a869b12785cdb (patch) | |
| tree | 8b09bb668b5bb6e4e24114d1e386e088bf4bb7a9 | |
| parent | 699a43704b804ff5db06c33d39d6d08db03b4a0e (diff) | |
| download | mariadb-git-2b6dd87b2c137229863f5eb0128a869b12785cdb.tar.gz | |
debian: 99-enable-encryption.cnf.preset file, not symlink
Prevents errors on Windows Linux subsystem.
Fix to pr #1600
| l--------- | debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset | 1 | ||||
| -rw-r--r-- | debian/mariadb-server-10.5.install | 1 |
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..a33b3267254 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 |