Make iBFT reading explicit from a higher level

Make iBFT reading explicit from a higher level, so the target list doesn't get
obliterated in the anaconda.id.reset() path.

Forward port from rhel-5 patch by pjones, commit id:
0c566de27f4beb311baef2c49761924ced188da2

1 files changed, 9 insertions, 8 deletions

diff --git a/iscsi.py b/iscsi.py
index ce2c8b6dc..482e2c0ba 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -201,14 +201,6 @@ class iscsi(object):
         if self.fwinfo and self.fwinfo.has_key("iface.initiatorname"):
             self._initiator = self.fwinfo["iface.initiatorname"]
             self.initiatorSet = True
-            self.startup()
-
-            # If there is a default drive in the iSCSI configuration, then
-            # automatically attach to it. Do this before testing the initiator
-            # name, because it is provided by the iBFT too
-
-            if flags.ibft:
-                self.loginToDefaultDrive()
 
     def _getInitiator(self):
         if self._initiator != "":
@@ -406,6 +398,15 @@ class iscsi(object):
         # make a new target
         self.addTarget(**values)
 
+
+    def startIBFT(self):
+        # If there is a default drive in the iSCSI configuration, then
+        # automatically attach to it. Do this before testing the initiator
+        # name, because it is provided by the iBFT too
+
+        if flags.ibft:
+            self.loginToDefaultDrive()
+
     def startup(self, intf = None):
         if not has_iscsi():
             return