diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 08:26:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 08:26:08 +0300 |
| commit | 44c5144943f534b9dcd8ac771955127c7e1c2146 (patch) | |
| tree | 3aab34b221a165f50758cc7d8c0f21f49d57c4ee /debian | |
| parent | 1ad79c818780aafe1aaf1c25bbf975eb31a38a40 (diff) | |
| parent | 896974fc3d721aabe1afbf637a566cab856a731d (diff) | |
| download | mariadb-git-44c5144943f534b9dcd8ac771955127c7e1c2146.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-server-10.2.postinst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/mariadb-server-10.2.postinst b/debian/mariadb-server-10.2.postinst index b68d2362387..063f0d8c58b 100644 --- a/debian/mariadb-server-10.2.postinst +++ b/debian/mariadb-server-10.2.postinst @@ -2,8 +2,8 @@ . /usr/share/debconf/confmodule -# assume the filename is /path/to/mariadb-server-##.#.postinst -VER=${0: -13:4} +# Automatically set version to ease maintenance of this file +MAJOR_VER="${DPKG_MAINTSCRIPT_PACKAGE#mariadb-server-}" if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } @@ -11,7 +11,7 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin # This command can be used as pipe to syslog. With "-s" it also logs to stderr. -ERR_LOGGER="logger -p daemon.err -t mariadb-server-$VER.postinst -i" +ERR_LOGGER="logger -p daemon.err -t mariadb-server-$MAJOR_VER.postinst -i" # This will make an error in a logged command immediately apparent by aborting # the install, rather than failing silently and leaving a broken install. set -o pipefail @@ -149,8 +149,8 @@ EOF # To avoid downgrades. - touch $mysql_statedir/debian-$VER.flag - + touch $mysql_statedir/debian-$MAJOR_VER.flag + ## On every reconfiguration the maintenance user is recreated. # # - It is easier to regenerate the password every time but as people |