From 01140016279379234e87b2addf62a76807950d07 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Tue, 29 Aug 2017 22:31:30 +0200 Subject: [PATCH] remember default __remote_{copy,exec} so we can use it ourself in custom __remote_{copy,exec} scripts Signed-off-by: Steven Armstrong --- cdist/conf/type/__install_config/files/remote/copy | 2 +- cdist/conf/type/__install_config/files/remote/exec | 2 +- cdist/conf/type/__install_config/gencode-local | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cdist/conf/type/__install_config/files/remote/copy b/cdist/conf/type/__install_config/files/remote/copy index 176b92bf..15c901f9 100755 --- a/cdist/conf/type/__install_config/files/remote/copy +++ b/cdist/conf/type/__install_config/files/remote/copy @@ -41,6 +41,6 @@ log "@: $@" log "code: $code" # copy files into chroot -$__remote_copy $code +$__default_remote_copy $code log "-----" diff --git a/cdist/conf/type/__install_config/files/remote/exec b/cdist/conf/type/__install_config/files/remote/exec index e90eb415..5b25e41e 100755 --- a/cdist/conf/type/__install_config/files/remote/exec +++ b/cdist/conf/type/__install_config/files/remote/exec @@ -44,6 +44,6 @@ log "@: $@" log "code: $code" # Run the code -$__remote_exec $target_host $code +$__default_remote_exec $target_host $code log "-----" diff --git a/cdist/conf/type/__install_config/gencode-local b/cdist/conf/type/__install_config/gencode-local index 29d9c121..d7e98734 100755 --- a/cdist/conf/type/__install_config/gencode-local +++ b/cdist/conf/type/__install_config/gencode-local @@ -39,6 +39,8 @@ case "$__cdist_loglevel" in esac cat << DONE +export __default_remote_exec="$__remote_exec" +export __default_remote_copy="$__remote_copy" cdist config \ $cdist_args \ --remote-exec="$remote_exec $chroot" \