From ae5e2c5a995016c143155822a4f5ce5a8a1031fd Mon Sep 17 00:00:00 2001 From: georglauterbach <44545919+georglauterbach@users.noreply.github.com> Date: Sun, 19 Jan 2025 11:04:22 +0100 Subject: [PATCH] fix: correct usage of '_environment_variables_export' Signed-off-by: georglauterbach <44545919+georglauterbach@users.noreply.github.com> --- target/scripts/start-mailserver.sh | 1 - target/scripts/startup/variables-stack.sh | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh index 7044c164..15e08aec 100755 --- a/target/scripts/start-mailserver.sh +++ b/target/scripts/start-mailserver.sh @@ -123,7 +123,6 @@ function _register_functions() { _register_setup_function '_setup_save_states' _register_setup_function '_setup_apply_fixes_after_configuration' - _register_setup_function '_environment_variables_export' if [[ ${ENABLE_MTA_STS} -eq 1 ]]; then _register_setup_function '_setup_mta_sts' diff --git a/target/scripts/startup/variables-stack.sh b/target/scripts/startup/variables-stack.sh index 3fa4d761..1f5c44d3 100644 --- a/target/scripts/startup/variables-stack.sh +++ b/target/scripts/startup/variables-stack.sh @@ -7,6 +7,7 @@ function _early_variables_setup() { _obtain_hostname_and_domainname __environment_variables_backwards_compatibility __environment_variables_general_setup + __environment_variables_export } # This function handles variables that are deprecated. This allows a @@ -190,7 +191,7 @@ function _environment_variables_saslauthd() { # This function Writes the contents of the `VARS` map (associative array) # to locations where they can be sourced from (e.g. `/etc/dms-settings`) # or where they can be used by Bash directly (e.g. `/root/.bashrc`). -function _environment_variables_export() { +function __environment_variables_export() { _log 'debug' "Exporting environment variables now (creating '/etc/dms-settings')" : >/root/.bashrc # make DMS variables available in login shells and their subprocesses