summaryrefslogtreecommitdiffstats
path: root/iscsi.py
diff options
context:
space:
mode:
authorHans de Goede <hans@localhost.localdomain>2008-09-15 10:19:04 +0200
committerHans de Goede <hans@localhost.localdomain>2008-09-15 10:19:04 +0200
commitbccb4ee453a7ca9ddc261b5ba8609e043969e2bb (patch)
tree38f4f0bda806ce11ca943892e2caaa4cd5d6e009 /iscsi.py
parent8b7a056ef2a3512f1c8215c4eb61ebf2256db0b9 (diff)
downloadanaconda-bccb4ee453a7ca9ddc261b5ba8609e043969e2bb.tar.gz
anaconda-bccb4ee453a7ca9ddc261b5ba8609e043969e2bb.tar.xz
anaconda-bccb4ee453a7ca9ddc261b5ba8609e043969e2bb.zip
Don't set iscsi devices to autostart (rhbz#437891)
Forward port of rhel-5 patch from pjones, commit-id: 2979c1195d9031b16d61ff14e3a6b0dcb3ee548f
Diffstat (limited to 'iscsi.py')
-rw-r--r--iscsi.py18
1 files changed, 1 insertions, 17 deletions
diff --git a/iscsi.py b/iscsi.py
index 48060d7e9..19cc6272c 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -127,18 +127,6 @@ class iscsiTarget:
return False
return True
- def startNode(self, node):
- if node is None or self.portal is None:
- log.warn("unable to find portal information")
- return
-
- argv = [ "-m", "node", "-T", node, "-p", self.portal,
- "-o", "update", "-n", "node.conn[0].startup",
- "-v", "automatic" ]
- log.debug("iscsiadm %s" %(string.join(argv),))
- iutil.execWithRedirect(ISCSIADM, argv,
- stdout = "/dev/tty5", stderr="/dev/tty5")
-
def loginToNode(self, node):
if node is None or self.portal is None:
log.warn("unable to find portal information")
@@ -158,14 +146,12 @@ class iscsiTarget:
log.warn("unable to find portal information")
return False
-
+ # return True if any login to our portal succeeds.
ret = False
for node in self.nodes:
if self.loginToNode(node):
ret = True
- self.startNode(node)
- # we return True if there were any successful logins for our portal.
return ret
def logout(self):
@@ -393,8 +379,6 @@ class iscsi(object):
t = iscsiTarget(ipaddr, port, None, None)
# this actually creates the entries.
t.discover()
- # and this sets them to auto-start
- t.startNode(node)
for t in self.targets:
if not t.discover():