Skip to content

Commit

Permalink
Debian: fixes a problem when migrating to dbconfig
Browse files Browse the repository at this point in the history
in some cases, Bareos fails to apply dbconfig setting to the Bareos configuration file.
With this change, these failures only result in a warning,
instead of letting the package installation fail.

Fixes #376: dkpg error
  • Loading branch information
joergsteffens committed Dec 17, 2014
1 parent 7b7867a commit 0f3c49c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions debian/bareos-database-common.postinst.in
Expand Up @@ -49,8 +49,8 @@ if [ -r @scriptdir@/bareos-config-lib.sh ]; then
# run dbconfig
dbc_go bareos-database-common $param1 $param2 $@

# apply the dbconfig settings
apply_dbconfig_settings
# apply the dbconfig settings, ignore errors
@scriptdir@/bareos-config apply_dbconfig_settings || true
fi
fi

Expand Down
1 change: 0 additions & 1 deletion scripts/bareos-config-lib.sh.in
Expand Up @@ -602,7 +602,6 @@ apply_dbconfig_settings()
if [ "$dbc_authmethod_user" != "ident" ] && [ "$dbc_dbpass" ]; then
set_config_param "${CFG_DIR}" "Catalog" "MyCatalog" "dbpassword" "$dbc_dbpass"
fi

}

get_local_hostname()
Expand Down

0 comments on commit 0f3c49c

Please sign in to comment.