diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 10:25:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 10:25:34 +0300 |
| commit | c016ea660ede8b7ff75f8ca65f73e2958262263a (patch) | |
| tree | c8bc8579c738792f0769ea70f49348dc1baf51b3 /debian | |
| parent | 1bbe8c5e0f6823acd4780d7563e8c02f8b4c5a01 (diff) | |
| parent | 2931fd2917cc130e34e5f3d9d6c571a2b013e49c (diff) | |
| download | mariadb-git-c016ea660ede8b7ff75f8ca65f73e2958262263a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-server-10.3.postinst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/mariadb-server-10.3.postinst b/debian/mariadb-server-10.3.postinst index 7874a691268..cedcd75ef46 100644 --- a/debian/mariadb-server-10.3.postinst +++ b/debian/mariadb-server-10.3.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 @@ -151,8 +151,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 |