mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

get rid of unnecessary tmp files

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2013-10-15 22:29:58 +02:00
parent fc988a5c22
commit a231898397
1 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cdist/conf/type/__install_config/files/remote/exec
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2011 Steven Armstrong (steven-cdist at armstrong.cc) # 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -35,39 +35,14 @@ target_host="$__target_host"
shift shift
ssh="ssh -o User=root -q $target_host" ssh="ssh -o User=root -q $target_host"
scp="scp -o User=root -q" code="$ssh chroot $chroot sh -c '$@'"
local_script=$(mktemp "/tmp/chroot-${0##*/}.XXXXXXXXXX")
remote_script=$($ssh mktemp "${chroot}/tmp/chroot-${0##*/}.XXXXXXXXXX")
relative_script="${remote_script#$chroot}"
trap cleanup INT TERM EXIT
cleanup() {
[ $__cdist_debug ] || {
rm "$local_script"
$ssh "rm $remote_script";
}
}
log "chroot: $chroot"
log "target_host: $target_host" log "target_host: $target_host"
log "local_script: $local_script" log "chroot: $chroot"
log "remote_script: $remote_script"
log "relative_script: $relative_script"
log "@: $@" log "@: $@"
cat > "$local_script" << DONE log "code: $code"
#!/bin/sh -l
# FIXME: fix the dependency bug, then test if the below is required or not
#if [ -f /etc/environment ]; then
# . /etc/environment
#fi
$@
DONE
# Upload script to target # Run the code
$scp $local_script $target_host:$remote_script $code
$ssh "chmod +x $remote_script"
# run in chroot
$ssh "chroot $chroot $relative_script"
log "-----" log "-----"