2007-10-22 Jeremy Katz <katzj@redhat.com>

	* iw/upgrade_bootloader_gui.py
	(UpgradeBootloaderWindow._newToLibata): Sync up with text mode version
	* textw/upgrade_bootloader_text.py
	(UpgradeBootloaderWindow._ideToLibata): Improve check so that it
	doesn't see F7 -> F8 updates as needing a new config

1 files changed, 20 insertions, 3 deletions

diff --git a/textw/upgrade_bootloader_text.py b/textw/upgrade_bootloader_text.py
index 55425baa9..59e071344 100644
--- a/textw/upgrade_bootloader_text.py
+++ b/textw/upgrade_bootloader_text.py
@@ -41,21 +41,38 @@ class UpgradeBootloaderWindow:
             log.debug("error reading /etc/modprobe.conf")
             return False
 
-        lines = f.readlines()
+        modlines = f.readlines()
         f.close()
 
-        for l in lines:
+        try:
+            f = open("/tmp/scsidisks")
+        except:
+            log.debug("error reading /tmp/scsidisks")
+            return False
+        mods = []
+        for l in f.readlines():
+            (disk, mod) = l.split()
+            if mod.strip() not in mods:
+                mods.append(mod.strip())
+        f.close()
+
+        for l in modlines:
             stripped = l.strip()
 
             if stripped == "" or stripped[0] == "#":
                 continue
 
             if stripped.find("scsi_hostadapter") != -1:
-                return True
+                mod = stripped.split()[-1]
+                if mod in mods:
+                    mods.remove(mod)
 
+        if len(mods) > 0:
+            return True
         return False
 
     def __call__(self, screen, anaconda):
+        self.screen = screen
         self.dispatch = anaconda.dispatch
         self.bl = anaconda.id.bootloader