Proxmox-Port/swtpm
1
0
Fork 0
mirror of https://github.com/stefanberger/swtpm.git synced 2026-01-14 21:18:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

swtpm_setup: Print error in case 'eval' fails on file permissions etc.

Browse Source 
Also have the log function print out all parameters.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2015-05-04 01:20:46 -04:00
parent a1004f8caa
commit cdbfb7be1a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/swtpm_setup/swtpm_setup.sh
View File

@ -87,18 +87,18 @@ trap "cleanup" SIGTERM EXIT
logit()
{
if [ -z "$LOGFILE" ]; then
echo "$1" >&1
echo "$@" >&1
else
echo "$1" >> $LOGFILE
echo "$@" >> $LOGFILE
fi
}
logit_cmd()
{
if [ -z "$LOGFILE" ]; then
eval "$1" >&1
eval "$@" >&1
else
eval "$1" >> $LOGFILE
eval "$@" >> $LOGFILE
fi
}
@ -121,7 +121,7 @@ call_create_certs()
local ek="$4"
local vmid="$5"
local logparam
local logparam tmp
local params="" cmd
if [ -n "$LOGFILE" ]; then
@ -166,9 +166,10 @@ call_create_certs()
--vmid "$vmid" \
${logparam} ${params}"
logit " Invoking: $(echo $cmd | tr -s " ")"
eval $cmd
tmp="$(eval $cmd 2>&1)"
ret=$?
if [ $ret -ne 0 ]; then
logerr "Error running '$cmd' : $tmp"
return $ret
fi
fi
@ -180,9 +181,10 @@ call_create_certs()
--vmid "$vmid" \
${logparam} ${params}"
logit " Invoking: $(echo $cmd | tr -s " ")"
eval $cmd
tmp="$(eval $cmd 2>&1)"
ret=$?
if [ $ret -ne 0 ]; then
logerr "Error running '$cmd' : $tmp"
return $ret
fi
fi