lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Make sure we 'sudo kill' our sudo pexpect process in close().

Browse Source 
This should more reliably shut down pexpect subprocesses when
build.py exits before completion.
This commit is contained in:
Bob Lantz
2014-09-24 11:57:46 -07:00
parent 12095a12f4
commit 61760eabc5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/vm/build.py
+6 -1
View File
@@ -441,7 +441,12 @@ def boot( cow, kernel, initrd, logfile, memory=1024 ):
returns: pexpect object to qemu process""" returns: pexpect object to qemu process"""
# pexpect might not be installed until after depend() is called # pexpect might not be installed until after depend() is called
global pexpect global pexpect
if not pexpect:
import pexpect import pexpect
class Spawn( pexpect.spawn ):
"Subprocess is sudo, so we have to sudo kill it"
def close( self, force=False ):
srun( 'kill %d' % self.pid )
arch = archFor( kernel ) arch = archFor( kernel )
log( '* Detected kernel architecture', arch ) log( '* Detected kernel architecture', arch )
if NoKVM: if NoKVM:
@@ -462,7 +467,7 @@ def boot( cow, kernel, initrd, logfile, memory=1024 ):
cmd = ' '.join( cmd ) cmd = ' '.join( cmd )
log( '* BOOTING VM FROM', cow ) log( '* BOOTING VM FROM', cow )
log( cmd ) log( cmd )
vm = pexpect.spawn( cmd, timeout=TIMEOUT, logfile=logfile ) vm = Spawn( cmd, timeout=TIMEOUT, logfile=logfile )
return vm return vm