2nd level cconfig generation works (with debug)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
d9a07bfa3e
commit
34f845ec86
3 changed files with 11 additions and 3 deletions
|
@ -27,5 +27,5 @@ __cdist_config=$(pwd -P)/conf __cdist_target_host=localhost cdist-explorer-run
|
||||||
find conf/cache/hosts/localhost
|
find conf/cache/hosts/localhost
|
||||||
|
|
||||||
# Soon working:
|
# 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
|
||||||
|
|
||||||
|
|
|
@ -61,9 +61,15 @@ while [ "$__cdist_object_created_new" = 1 ]; do
|
||||||
if [ ! -f "${object}/$__cdist_object_finished" ]; then
|
if [ ! -f "${object}/$__cdist_object_finished" ]; then
|
||||||
echo "Running object ${object} ..."
|
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
|
if [ -x "${manifest}" ]; then
|
||||||
cdist-manifest-run "${manifest}" "${__cdist_tmp_dir}"
|
cdist-manifest-run "${__cdist_tmp_dir}" "${manifest}"
|
||||||
|
|
||||||
echo "Trying to merge... "
|
echo "Trying to merge... "
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,8 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
|
. cdist-config
|
||||||
|
|
||||||
destination=/etc/issue
|
destination=/etc/issue
|
||||||
|
|
||||||
case "$__cdist_explorer_os" in
|
case "$__cdist_explorer_os" in
|
||||||
|
|
Loading…
Reference in a new issue