summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-10-13 09:29:34 (GMT)
committerHerman van Rink2017-10-13 09:29:34 (GMT)
commitd4336454a1fba639a3043ce911471cf4dd31b61b (patch)
tree677df6eb05e823b4143a65920610076465841732
parentb4b846a88b86090cd3504f2cbd68c5f2407d190e (diff)
Issue #2915491: Only load the ID variable from os-release to avoid name conflicts
-rw-r--r--debian/aegir3-hostmaster.postinst6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/aegir3-hostmaster.postinst b/debian/aegir3-hostmaster.postinst
index 909ccd2..285391f 100644
--- a/debian/aegir3-hostmaster.postinst
+++ b/debian/aegir3-hostmaster.postinst
@@ -115,13 +115,13 @@ case "$1" in
db_get "aegir/db_host"
AEGIR_DB_HOST="$RET"
- # Source os-release to properly handle differences between distributions
- . /etc/os-release
+ # Read /etc/os-release to properly handle differences between distributions
+ OS_ID=$(grep ^ID /etc/os-release | cut -d= -f2)
# Determin if we create a db accoount or ask for it.
# Starting from MariaDB 10.1... https://www.drupal.org/node/2770819
# TODO: Work with future versions
- if [ $ID = 'debian' ] && dpkg -s mariadb-server-10.1 > /dev/null 2>&1
+ if [ $OS_ID = 'debian' ] && dpkg -s mariadb-server-10.1 > /dev/null 2>&1
then
# MariaDB = 10.1
CREATEUSER=1