diff options
| author | Chris Lumens <clumens@redhat.com> | 2007-05-01 20:08:33 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2007-05-01 20:08:33 +0000 |
| commit | 96c2567e2d4acaed927c3edd4654a718b6144048 (patch) | |
| tree | aba03cdeff4ba3488c348061733eec8853a23e94 /iscsi.py | |
| parent | 238f5aee10f0b6b4ea274e17c6352b223b1ce7aa (diff) | |
| download | anaconda-96c2567e2d4acaed927c3edd4654a718b6144048.tar.gz anaconda-96c2567e2d4acaed927c3edd4654a718b6144048.tar.xz anaconda-96c2567e2d4acaed927c3edd4654a718b6144048.zip | |
Be smarter about getting the PID of iscsiadm to avoid a traceback (#223257).
Diffstat (limited to 'iscsi.py')
| -rw-r--r-- | iscsi.py | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -171,13 +171,12 @@ class iscsi(object): t.logout() # XXX use iscsiadm shutdown when it's available. - argv = [ "--no-headers", "-C", "%s" % (ISCSID,) ] - psout = iutil.execWithCapture("/usr/bin/ps", argv) - for line in psout.split("\n"): - if line: - pid = string.atoi(string.split(line)[0]) - log.info("Killing %s %d" % (ISCSID, pid)) - os.kill(pid, signal.SIGKILL) + psout = iutil.execWithCapture("/usr/bin/pidof", ["iscsiadm"]) + if psout.strip() != "": + pid = string.atoi(psout.split()[0]) + log.info("Killing %s %d" % (ISCSID, pid)) + os.kill(pid, signal.SIGKILL) + self.iscsidStarted = False; def startup(self, intf = None): |