diff --git a/mininet/node.py b/mininet/node.py index 4461a40103be6349c140c79580dc3191d23d1bfc..c6ad614b7451be255d8d4ee1c083e4c1a21f8dff 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -239,16 +239,12 @@ def sendCmd( self, *args, **kwargs ): # Replace empty commands with something harmless cmd = 'echo -n' self.lastCmd = cmd - if printPid and not isShellBuiltin( cmd ): - if len( cmd ) > 0 and cmd[ -1 ] == '&': - # print ^A{pid}\n so monitor() can set lastPid - cmd += ' printf "\\001%d\\012" $! ' - else: - cmd = 'mnexec -p ' + cmd - # if a builtin command is backgrounded, it yields a PID - elif isShellBuiltin( cmd ): - if len( cmd ) > 0 and cmd[ -1 ] == '&': - cmd += ' printf "\\001%d\\012" $! ' + # if a builtin command is backgrounded, it still yields a PID + if len( cmd ) > 0 and cmd[ -1 ] == '&': + # print ^A{pid}\n so monitor() can set lastPid + cmd += ' printf "\\001%d\\012" $! ' + elif printPid and not isShellBuiltin( cmd ): + cmd = 'mnexec -p ' + cmd self.write( cmd + '\n' ) self.lastPid = None self.waiting = True