evilham
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

introduce __cdist_local_base_dir and use it in HACKERS_README 

This way out/ and conf/ are debugable.

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-23 19:05:46 +01:00
parent e6c4533464
commit 957ab446fa
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HACKERS_README
View File

@ -27,10 +27,9 @@ set -x
export PATH="$PATH:$(pwd -P)/bin"
export __cdist_conf_dir="$(pwd -P)/conf"
# Change paths so we can debug stuff :-)
export __cdist_out_dir=/tmp/localhost
export __cdist_local_base_dir=/tmp/localhost
target="${1:-localhost}"
cdist-deploy-to "$target"
find "${__cdist_out_dir}"
find "${__cdist_local_base_dir}"

3
bin/cdist-config
View File

@ -90,7 +90,8 @@ __cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")
__cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
# Local output base directory
: ${__cdist_out_dir:=$__cdist_tmp_dir/$__cdist_name_out_dir}
: ${__cdist_local_base_dir:=$__cdist_tmp_dir}
: ${__cdist_out_dir:=$__cdist_local_base_dir/$__cdist_name_out_dir}
: ${__cdist_out_explorer_dir:=$__cdist_out_dir/$__cdist_name_explorer}
: ${__cdist_out_object_dir:=$__cdist_out_dir/$__cdist_name_object}
: ${__cdist_out_type_bin_dir:=$__cdist_out_dir/$__cdist_name_type_bin}

5
bin/cdist-deploy-to
View File

@ -40,11 +40,12 @@ cdist-explorer-run-init "$__cdist_target_host" "$__cdist_out_explorer_dir"
# Create initial object base
cdist-manifest-init "$__cdist_target_host" "$__cdist_out_object_dir"
# Create dependent objects
cdist-manifest-run-all "$__cdist_target_host" "$__cdist_out_object_dir"
exit 2
cdist-manifest-run-all "$__cdist_target_host" "$__cdist_out_object_dir"
cdist-object-explorer-all "$__cdist_target_host" "$__cdist_out_object_dir"
exit 0
cdist-object-codegen-all "$__cdist_target_host" "$__cdist_out_object_dir" "$__cdist_out_execs"
cdist-exec-transfer "$__cdist_target_host" "$__cdist_out_execs"
cdist-exec-run "$__cdist_target_host"

2
conf/types/__issue/manifest
View File

@ -21,7 +21,7 @@
destination=/etc/issue
case "$(cat "$__cdist_out_explorers/os")" in
case "$(cat "out/explorers/os")" in
archlinux)
source="$(pwd -P)/files/archlinux"
;;