begin to integrate out_dir in cdist_config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
17838de1ef
commit
d7299b8ab1
2 changed files with 4 additions and 3 deletions
|
@ -92,6 +92,7 @@ export __cdist_tmp_file
|
||||||
|
|
||||||
# Local output base directory
|
# Local output base directory
|
||||||
: ${__cdist_out_dir:=$__cdist_tmp_dir/$__cdist_name_out_dir}
|
: ${__cdist_out_dir:=$__cdist_tmp_dir/$__cdist_name_out_dir}
|
||||||
|
: ${__cdist_out_explorer_dir:=$__cdist_out_dir/$__cdist_name_explorer}
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
|
@ -27,16 +27,16 @@ set -eu
|
||||||
|
|
||||||
__cdist_target_host="$1"
|
__cdist_target_host="$1"
|
||||||
|
|
||||||
: ${__cdist_out_explorers:="$__cdist_tmp_dir/$__cdist_name_explorer"}
|
|
||||||
: ${__cdist_out_objects:="$__cdist_tmp_dir/$__cdist_name_object"}
|
: ${__cdist_out_objects:="$__cdist_tmp_dir/$__cdist_name_object"}
|
||||||
: ${__cdist_out_execs:="$__cdist_tmp_dir/$__cdist_name_exec"}
|
: ${__cdist_out_execs:="$__cdist_tmp_dir/$__cdist_name_exec"}
|
||||||
|
|
||||||
export __cdist_out_explorers
|
|
||||||
export __cdist_out_objects
|
export __cdist_out_objects
|
||||||
export __cdist_out_execs
|
export __cdist_out_execs
|
||||||
|
|
||||||
# See cdist-stages(7)
|
# See cdist-stages(7)
|
||||||
cdist-explorer-run-init "$__cdist_target_host" "$__cdist_out_explorers"
|
cdist-explorer-run-init "$__cdist_target_host" "$__cdist_out_explorer_dir"
|
||||||
|
|
||||||
|
exit 2
|
||||||
cdist-manifest-init "$__cdist_target_host" "$__cdist_out_objects"
|
cdist-manifest-init "$__cdist_target_host" "$__cdist_out_objects"
|
||||||
cdist-manifest-run-all "$__cdist_target_host" "$__cdist_out_objects"
|
cdist-manifest-run-all "$__cdist_target_host" "$__cdist_out_objects"
|
||||||
cdist-object-explorer-all "$__cdist_target_host" "$__cdist_out_objects"
|
cdist-object-explorer-all "$__cdist_target_host" "$__cdist_out_objects"
|
||||||
|
|
Loading…
Reference in a new issue