Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: use conf.d notation in shell utilities ......................................................................
packaging: use conf.d notation in shell utilities Change-Id: Icb03986e385cf786fa191095ad7fcc443d2f1199 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/tools/src/main/shell/engine-prolog.sh.in 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/12677/1 diff --git a/backend/manager/tools/src/main/shell/engine-prolog.sh.in b/backend/manager/tools/src/main/shell/engine-prolog.sh.in index 44267d3..d5d54b6 100644 --- a/backend/manager/tools/src/main/shell/engine-prolog.sh.in +++ b/backend/manager/tools/src/main/shell/engine-prolog.sh.in @@ -17,11 +17,10 @@ # Load the configuration file: ENGINE_VARS="${ENGINE_VARS:-@ENGINE_VARS@}" export ENGINE_VARS - if [ ! -r "${ENGINE_VARS}" ] - then - die "Can't load configuration file \"${ENGINE_VARS}\"." - fi - . "${ENGINE_VARS}" + + for f in "${ENGINE_VARS}" $(find "${ENGINE_VARS}.d" -name '*.conf' | sort); do + [ -r "${f}" ] && . "${f}" + done # Clean the class path: CLASSPATH="" -- To view, visit http://gerrit.ovirt.org/12677 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb03986e385cf786fa191095ad7fcc443d2f1199 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
