../core/__cdist_manifest_run_init

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-06-14 01:22:51 +02:00
parent da9974b9ce
commit 47c32d1b53
3 changed files with 7 additions and 12 deletions

View file

@ -55,7 +55,7 @@ __cdist_dir push "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
__cdist_dir push "${__cdist_core_dir}" "${__cdist_remote_core_dir}" __cdist_dir push "${__cdist_core_dir}" "${__cdist_remote_core_dir}"
cdist-explorer-run-global "$__cdist_target_host" cdist-explorer-run-global "$__cdist_target_host"
cdist-manifest-run-init "$__cdist_target_host" __cdist_manifest_run_init "$__cdist_target_host"
__cdist_object_all __cdist_object_prepare __cdist_object_all __cdist_object_prepare
__cdist_object_all __cdist_object_run __cdist_object_all __cdist_object_run
cdist-cache "$__cdist_target_host" cdist-cache "$__cdist_target_host"

View file

@ -24,9 +24,7 @@
__cdist_manifest_run() __cdist_manifest_run()
{ {
[ $# -eq 1 ] || __cdist_usage "<manifest>" [ $# -eq 1 ] || __cdist_usage "<manifest>"
set -u
__cdist_manifest="$1"; shift __cdist_manifest="$1"; shift

View file

@ -22,13 +22,10 @@
# And save it into the cache tree # And save it into the cache tree
# #
. cdist-config __cdist_manifest_run_init()
[ $# -eq 1 ] || __cdist_usage "<target host>" {
set -e eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\"
__cdist_target_host="$1"; shift __cdist_echo info "Running initial manifest for $__cdist_target_host "
__cdist_manifest_run "$__cdist_manifest_init"
eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\" }
__cdist_echo info "Running initial manifest for $__cdist_target_host "
__cdist_manifest_run "$__cdist_manifest_init"