Attachment 296261 Details for Bug 435365 – iscsi-stderr.patch

[patch] iscsi-stderr.patch

iscsi-stderr.patch (text/plain), 2.16 KB, created by James Laska on 2008-02-28 20:53:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Laska

Created: 2008-02-28 20:53:09 UTC

Size: 2.16 KB

patch

obsolete

>diff --git a/iscsi.py b/iscsi.py
>index d23f198..1d46f18 100644
>--- a/iscsi.py
>+++ b/iscsi.py
>@@ -77,7 +77,7 @@ class iscsiTarget:
>         if self._portal is None:
>             argv = [ "-m", "discovery", "-t", "st", "-p", self.ipaddr ]
>             log.debug("iscsiadm %s" %(string.join(argv),))
>-            records = iutil.execWithCapture(ISCSIADM, argv)
>+            records = iutil.execWithCapture(ISCSIADM, argv, stderr="/dev/tty5")
>             records = records.strip()
>             for line in records.split("\n"):
>                 log.debug("  %s" % (line,))
>@@ -219,7 +219,7 @@ class iscsi(object):
> 
>         argv = [ "-m", "fw" ]
>         log.debug("queryFirmware: ISCSIADM is %s" % (ISCSIADM,))
>-        result = iutil.execWithCapture(ISCSIADM, argv)
>+        result = iutil.execWithCapture(ISCSIADM, argv, stderr="/dev/tty5")
>         result = result.strip()
>         for line in result.split("\n"):
>             SPLIT = " = "
>@@ -232,7 +232,7 @@ class iscsi(object):
>         return retval
> 
>     def _startIscsiDaemon(self):
>-        psout = iutil.execWithCapture("/usr/bin/pidof", ["iscsid"])
>+        psout = iutil.execWithCapture("/usr/bin/pidof", ["iscsid"], stderr="/dev/tty5")
>         if psout.strip() == "":
>             log.info("iSCSI startup")
>             iutil.execWithRedirect(ISCSID, [],
>@@ -241,12 +241,12 @@ class iscsi(object):
>             time.sleep(2)
> 
>     def _stopIscsiDaemon(self):
>-        result = iutil.execWithCapture(ISCSIADM, ["-k", "0"])
>+        result = iutil.execWithCapture(ISCSIADM, ["-k", "0"], stderr="/dev/tty5")
>         result.strip()
>         if result == "":
>             return
> 
>-        psout = iutil.execWithCapture("/usr/bin/pidof", ["iscsid"])
>+        psout = iutil.execWithCapture("/usr/bin/pidof", ["iscsid"], stderr="/dev/tty5")
>         if psout.strip() != "":
>             log.info("iSCSI shutdown")
>             for t in self.targets:
>@@ -281,7 +281,7 @@ class iscsi(object):
>         find_iscsi_files()
> 
>         argv = [ "-m", "fw", "-l" ]
>-        result = iutil.execWithCapture(ISCSIADM, argv)
>+        result = iutil.execWithCapture(ISCSIADM, argv, stderr="/dev/tty5")
> 
>         TARGET = "target: "
>         PORTAL = ", portal: "

Actions: View | Diff

Attachments on bug 435365: 296261