also kill children in cdist core
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
b1f10f2936
commit
a202826a62
2 changed files with 3 additions and 1 deletions
|
@ -352,6 +352,7 @@ __cdist_remote_type_explorer_dir()
|
||||||
#
|
#
|
||||||
__cdist_tmp_removal()
|
__cdist_tmp_removal()
|
||||||
{
|
{
|
||||||
|
kill 0
|
||||||
rm -rf "${__cdist_tmp_dir}"
|
rm -rf "${__cdist_tmp_dir}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,10 +30,11 @@ trap killandclean EXIT
|
||||||
|
|
||||||
killandclean()
|
killandclean()
|
||||||
{
|
{
|
||||||
|
__cdist_echo info "Existing and killing children..."
|
||||||
kill 0
|
kill 0
|
||||||
|
|
||||||
# Ensure tmp stuff is being removed
|
# Ensure tmp stuff is being removed
|
||||||
__cdist_tmp_removal
|
__cdist_cleanly_exit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue