- add or remove scsi_hostadapter alias from modprobe.conf, if any fcp devices are configured/not configured. Untested, but at least survives pycheck.

1 files changed, 32 insertions, 5 deletions

diff --git a/zfcp.py b/zfcp.py
index 5c9c0c2a1..c617b672b 100644
--- a/zfcp.py
+++ b/zfcp.py
@@ -92,6 +92,38 @@ class ZFCP:
             except:
                continue
 
+    def writeModprobeConf(self, fcpdevices):
+        lines = []
+        try:
+            f = open("/tmp/modprobe.conf", "r")
+            lines = f.readlines()
+            f.close()
+        except:
+            pass
+        foundalias = 0
+        for line in lines:
+            if line == "alias scsi_hostadapter zfcp":
+                foundalias = 1
+                break
+        if len(fcpdevices):
+            if not foundalias:
+                try:
+                    f = open("/tmp/modprobe.conf", "a")
+                    f.write("alias scsi_hostadapter zfcp")
+                    f.close()
+                except:
+                    pass
+        if not len(fcpdevices):
+            if foundalias:
+                try:
+                    f = open("/tmp/modprobe.conf", "w")
+                    for line in lines:
+                        if line != "alias scsi_hostadapter zfcp":
+                            f.write(line)
+                    f.close()
+                except:
+                    pass
+
     def write(self, instPath):
         if not len(self.fcpdevices):
             return
@@ -104,10 +136,6 @@ class ZFCP:
         for dev in self.fcpdevices:
             f.write("%s %s %s %s %s\n" % (dev[0], dev[1], dev[2], dev[3], dev[4],))
         f.close()
-        fn = "%s/etc/modprobe.conf" % (instpath,)
-        f = open(fn, "a")
-        f.write("alias scsi_hostadapter zfcp")
-        f.close()
 
     def writeKS(self,fcpdevices):
         # FIXME KH not implemented yet
@@ -146,7 +174,6 @@ class ZFCP:
         if lun[:2] == "0x":
             lun = lun[2:]
         lun = "0x" + "0" * (4 - len(lun)) + lun
-        length = len(lun) - 2
         lun = lun + "0" * (16 - len(lun) + 2)
         return lun