AR Steven: DOC: manifest can access $__type (implement $__type ;-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
3b7bbb0756
commit
06a56ab6d2
3 changed files with 4 additions and 2 deletions
|
@ -57,6 +57,7 @@ __cdist_version="1.0.0"
|
||||||
: ${__cdist_name_var_target_host:=__$__cdist_name_target_host}
|
: ${__cdist_name_var_target_host:=__$__cdist_name_target_host}
|
||||||
: ${__cdist_name_var_object:=__$__cdist_name_object}
|
: ${__cdist_name_var_object:=__$__cdist_name_object}
|
||||||
: ${__cdist_name_var_object_id:=__$__cdist_name_object_id}
|
: ${__cdist_name_var_object_id:=__$__cdist_name_object_id}
|
||||||
|
: ${__cdist_name_var_type:=__$__cdist_name_type}
|
||||||
|
|
||||||
|
|
||||||
# Base
|
# Base
|
||||||
|
|
|
@ -70,6 +70,7 @@ while [ "$__cdist_new_objects_created" = "y" ]; do
|
||||||
# Make variables available to non-core
|
# Make variables available to non-core
|
||||||
export $__cdist_name_var_object="$__cdist_cur_object_dir"
|
export $__cdist_name_var_object="$__cdist_cur_object_dir"
|
||||||
export $__cdist_name_var_object_id="$__cdist_object_id"
|
export $__cdist_name_var_object_id="$__cdist_object_id"
|
||||||
|
export $__cdist_name_var_type="$(__cdist_type_dir "$__cdist_type")"
|
||||||
|
|
||||||
cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" \
|
cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" \
|
||||||
"$__cdist_new_objects_dir"
|
"$__cdist_new_objects_dir"
|
||||||
|
|
|
@ -24,10 +24,10 @@ os="$(cat "out/explorer/os")"
|
||||||
|
|
||||||
case "$os" in
|
case "$os" in
|
||||||
archlinux)
|
archlinux)
|
||||||
source="$(pwd -P)/files/archlinux"
|
source="$__type/files/archlinux"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
source="$(pwd -P)/files/default"
|
source="$__type/files/default"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue