Merge branch 'master' into autorequire

This commit is contained in:
Steven Armstrong 2011-11-17 22:13:21 +01:00
commit ad24bbc696
1 changed files with 4 additions and 2 deletions

View File

@ -49,7 +49,7 @@ my_name="${0##*/}"
mode="$1"; shift
log() {
#echo "$@" | logger -t "cdist-$my_name-$mode"
echo "$@" | logger -t "cdist-$my_name-$mode"
:
}
@ -112,7 +112,9 @@ fi
case "$mode" in
exec)
code="$exec_prefix schroot -c $schroot_name -- $@"
# In exec mode the first argument is the __target_host which we already got from env. Get rid of it.
shift
code="$exec_prefix schroot -c $schroot_name -- sh -c '$@'"
;;
copy)
# get directory for given chroot_name