Merge branch 'master' into autorequire
This commit is contained in:
commit
ad24bbc696
1 changed files with 4 additions and 2 deletions
|
@ -49,7 +49,7 @@ my_name="${0##*/}"
|
||||||
mode="$1"; shift
|
mode="$1"; shift
|
||||||
|
|
||||||
log() {
|
log() {
|
||||||
#echo "$@" | logger -t "cdist-$my_name-$mode"
|
echo "$@" | logger -t "cdist-$my_name-$mode"
|
||||||
:
|
:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,7 +112,9 @@ fi
|
||||||
|
|
||||||
case "$mode" in
|
case "$mode" in
|
||||||
exec)
|
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)
|
copy)
|
||||||
# get directory for given chroot_name
|
# get directory for given chroot_name
|
||||||
|
|
Loading…
Reference in a new issue