diff --git a/HACKERS_README b/HACKERS_README index 82185ab5..20c1c051 100644 --- a/HACKERS_README +++ b/HACKERS_README @@ -27,5 +27,5 @@ __cdist_config=$(pwd -P)/conf __cdist_target_host=localhost cdist-explorer-run find conf/cache/hosts/localhost # Soon working: -cdist-manifest-recursive-run ~/p/cdist/conf/cache/hosts/localhost/objects +__cdist_config=$(pwd -P)/conf __cdist_target_host=localhost cdist-manifest-recursive-run ~/p/cdist/conf/cache/hosts/localhost/objects diff --git a/bin/cdist-manifest-recursive-run b/bin/cdist-manifest-recursive-run index efd46b19..3e18999f 100755 --- a/bin/cdist-manifest-recursive-run +++ b/bin/cdist-manifest-recursive-run @@ -61,9 +61,15 @@ while [ "$__cdist_object_created_new" = 1 ]; do if [ ! -f "${object}/$__cdist_object_finished" ]; then echo "Running object ${object} ..." - manifest="${object}/${__cdist_name_init}" + set -x + pwd + + type=${object%%/*} + + manifest="$__cdist_type_dir/${type}/${__cdist_name_init}" + if [ -x "${manifest}" ]; then - cdist-manifest-run "${manifest}" "${__cdist_tmp_dir}" + cdist-manifest-run "${__cdist_tmp_dir}" "${manifest}" echo "Trying to merge... " diff --git a/conf/types/__issue/init b/conf/types/__issue/init index 723a1378..f525c2df 100755 --- a/conf/types/__issue/init +++ b/conf/types/__issue/init @@ -19,6 +19,8 @@ # # +. cdist-config + destination=/etc/issue case "$__cdist_explorer_os" in