Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'r1-beta1-fixes' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core into r1-beta1

Browse Source
This commit is contained in:
Joanna Rutkowska 2011-05-10 11:42:07 +02:00
commit bed132d951
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appvm/qubes_core_appvm
View File

@ -26,7 +26,7 @@ start()
fi fi
type=$(/usr/bin/xenstore-read qubes_vm_type) type=$(/usr/bin/xenstore-read qubes_vm_type)
if [ "$type" != "AppVM" -a "$type" != "DisposableVM" ]; then if [ "$type" != "AppVM" -a "$type" != "DisposableVM" -a "$type" != "TemplateVM" ]; then
# This script runs only on AppVMs # This script runs only on AppVMs
return 0 return 0
fi fi

2
appvm/qvm-copy-to-vm
View File

@ -49,7 +49,7 @@ while true ; do
read agentpid sentsize agentstatus < $PROGRESS_FILE read agentpid sentsize agentstatus < $PROGRESS_FILE
if [ "x"$agentstatus = x ] ; then continue ; fi if [ "x"$agentstatus = x ] ; then continue ; fi
if ! [ -e /proc/$agentpid ] ; then break ; fi if ! [ -e /proc/$agentpid ] ; then break ; fi
if [ "x"$agentstatus = xdone ] ; then break ; fi if [ "x"$agentstatus = xDONE ] ; then break ; fi
CURRSIZE=$(($sentsize/1024)) CURRSIZE=$(($sentsize/1024))
if [ $DO_PROGRESS = 1 ] ; then if [ $DO_PROGRESS = 1 ] ; then
echo -ne "\r sent $CURRSIZE/$SIZE KB " echo -ne "\r sent $CURRSIZE/$SIZE KB "