[Qa-jenkins-scm] [jenkins.debian.net] 02/03: g-i: fix bug in detecting when qemu has quit

Holger Levsen holger at moszumanska.debian.org
Sun May 3 10:26:41 UTC 2015


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit d716c73f7cdcc663d4cc1ac0b9e47cfb856a9044
Author: Steven Chamberlain <steven at pyro.eu.org>
Date:   Sat May 2 21:07:36 2015 +0100

    g-i: fix bug in detecting when qemu has quit
    
    If running on VNC :1, this grep would also match :11, :12,: 13 etc.
    and likely not realise qemu on VNC :1 has quit.
---
 bin/g-i-installation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index ea80965..e845356 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -1027,7 +1027,7 @@ monitor_system() {
 		#
 		# break if qemu-system has finished
 		#
-		if ! ps fax | grep [q]emu-system | grep vnc=$DISPLAY >/dev/null; then
+		if ! ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " >/dev/null; then
 			touch $RESULTS/qemu_quit
 			break
 		fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list