Skip to content
GitLab
Commit 02b0d7d7 authored by Ondrej Sury's avatar Ondrej Sury
Browse files

Fix the invalid location of insserv configuration snippet (Thanks mbiebl for catching that)

parent b3c0331a
Hide whitespace changes
Inline Side-by-side
debian/mariadb-server-10.1.install
View file @ 02b0d7d7
...@@ -9,7 +9,7 @@ debian/additions/echo_stderr usr/share/mysql ...@@ -9,7 +9,7 @@ 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-mysqld_safe.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks
debian/mariadb-server-10.1.insserv.conf etc/insserv.conf.d/mariadb debian/mariadb-server-10.1.insserv.conf => etc/insserv.conf.d/mariadb
etc/apparmor.d/usr.sbin.mysqld etc/apparmor.d/usr.sbin.mysqld
[linux-any] lib/systemd/system/mariadb@.service [linux-any] lib/systemd/system/mariadb@.service
[linux-any] lib/systemd/system/mariadb.service [linux-any] lib/systemd/system/mariadb.service
......
debian/mariadb-server-10.1.preinst
View file @ 02b0d7d7
...@@ -9,6 +9,11 @@ ...@@ -9,6 +9,11 @@
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
# Just kill the invalid insserv.conf.d directory without fallback
if [ -d "/etc/insserv.conf.d/mariadb/" ]; then
rm -rf "/etc/insserv.conf.d/mariadb/"
fi
if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
......
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