Add ibft flag to ease in testing.

Forward port of rhel-5 patch from pjones, commit-id:
5a44a5a6bc90fdf056db1e9e2d4191703387c15f

3 files changed, 8 insertions, 1 deletions

diff --git a/anaconda b/anaconda
index 6ed54a5f3..7bdef43ed 100755
--- a/anaconda
+++ b/anaconda
@@ -264,6 +264,8 @@ def parseOptions():
     op.add_option("--nodmraid", dest="dmraid", action="store_false", default=True)
     op.add_option("--dmraid", action="store_true")
 
+    op.add_option("--noibft", dest="ibft", action="store_false", default=True)
+    op.add_option("--ibft", action="store_true")
     op.add_option("--noiscsi", dest="iscsi", action="store_false", default=False)
     op.add_option("--iscsi", action="store_true")
 
@@ -699,6 +701,9 @@ if __name__ == "__main__":
                 if len(cargs[1]) > 0:
                     vncS.vncconnectport = cargs[1]
 
+    if opts.ibft:
+        flags.ibft = 1
+
     if opts.iscsi:
         flags.iscsi = 1
 
diff --git a/flags.py b/flags.py
index 85d0771cc..2d77bd794 100644
--- a/flags.py
+++ b/flags.py
@@ -64,6 +64,7 @@ class Flags:
 	self.__dict__['flags']['test'] = 0
 	self.__dict__['flags']['rootpath'] = 0
 	self.__dict__['flags']['livecdInstall'] = 0
+	self.__dict__['flags']['ibft'] = 1
 	self.__dict__['flags']['iscsi'] = 0
 	self.__dict__['flags']['serial'] = 0
 	self.__dict__['flags']['setupFilesystems'] = 1
diff --git a/iscsi.py b/iscsi.py
index dd5377377..ce2c8b6dc 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -207,7 +207,8 @@ class iscsi(object):
             # automatically attach to it. Do this before testing the initiator
             # name, because it is provided by the iBFT too
 
-            self.loginToDefaultDrive()
+            if flags.ibft:
+                self.loginToDefaultDrive()
 
     def _getInitiator(self):
         if self._initiator != "":