Commit 2b8ae34b authored by Andreas Beckmann's avatar Andreas Beckmann
Browse files

mariadb-common.postinst: drop fallback my.cnf symlink management

parent 25e0015b
...@@ -3,6 +3,7 @@ mariadb-10.0 (10.0.20-3) UNRELEASED; urgency=medium ...@@ -3,6 +3,7 @@ mariadb-10.0 (10.0.20-3) UNRELEASED; urgency=medium
[ Andreas Beckmann ] [ Andreas Beckmann ]
* mariadb-common: Depend on a version of mysql-common that ships * mariadb-common: Depend on a version of mysql-common that ships
/usr/share/mysql-common/configure-symlinks. (Closes: #787533) /usr/share/mysql-common/configure-symlinks. (Closes: #787533)
* mariadb-common.postinst: Drop fallback my.cnf symlink management.
-- Andreas Beckmann <anbe@debian.org> Wed, 08 Jul 2015 09:09:58 +0200 -- Andreas Beckmann <anbe@debian.org> Wed, 08 Jul 2015 09:09:58 +0200
......
...@@ -4,23 +4,7 @@ set -e ...@@ -4,23 +4,7 @@ set -e
case "$1" in case "$1" in
configure) configure)
# New packaging paradigm for my.cnf as of Dec-2014 for sharing mysql
# variants in Ubuntu. If the new mysql-common package does not provide
# the update-alternatives facility, fall back to creating a symlink
if [ -f /usr/share/mysql-common/configure-symlinks ]
then
/usr/share/mysql-common/configure-symlinks install mariadb "/etc/mysql/mariadb.cnf" /usr/share/mysql-common/configure-symlinks install mariadb "/etc/mysql/mariadb.cnf"
else
# As configure can be called many times, don't re-create the symlink
# if it is there already
if [ ! -L /etc/mysql/my.cnf ]
then
echo "Notice: configure-symlinks trigger could not be called."
echo "Creating /etc/mysql/my.cnf as a symlink that points to mariadb.cnf."
mv -f /etc/mysql/my.cnf /etc/mysql/my.cnf.old
ln -sf mariadb.cnf /etc/mysql/my.cnf
fi
fi
;; ;;
abort-upgrade|abort-remove|abort-configure) abort-upgrade|abort-remove|abort-configure)
......
...@@ -4,8 +4,6 @@ set -e ...@@ -4,8 +4,6 @@ set -e
case "$1" in case "$1" in
remove|disappear) remove|disappear)
# New packaging paradigm for my.cnf as of Dec-2014 for sharing mysql
# variants in Ubuntu.
if [ -f /usr/share/mysql-common/configure-symlinks ] if [ -f /usr/share/mysql-common/configure-symlinks ]
then then
/usr/share/mysql-common/configure-symlinks remove mariadb "/etc/mysql/mariadb.cnf" /usr/share/mysql-common/configure-symlinks remove mariadb "/etc/mysql/mariadb.cnf"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment