- More fixes for vfat /boot/efi partition handling

5 files changed, 31 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 75e298883..cad847564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2007-01-22  Peter Jones  <pjones@redhat.com>
 
+	* isys/isys.py (readFATLabel): get the ia64 check right.
+
+	* upgrade.py (upgradeMigrateFind): don't show the "upgrade
+	filesystems" window if we're on ia64 and the only upgradeable FS is
+	the vfat /boot/efi fs (#223890).
+
+	* iw/upgrade_migratefs_gui.py (UpgradeMigrateFSWindow): don't show
+	"/boot/efi" in migratable fs list.
+
+	* textw/upgrade_text.py (UpgradeMigrateFSWindow): ditto.
+
+2007-01-22  Peter Jones  <pjones@redhat.com>
+
 	* anaconda.spec: Bump version.
 
 2007-01-22  Peter Jones  <pjones@redhat.com>
diff --git a/isys/isys.py b/isys/isys.py
index a9bcb625c..2f8ea0949 100644
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -650,7 +650,7 @@ def _readFATLabel(device):
     return label
 
 def readFATLabel(device, makeDevNode = 1):
-    if rhpl.getArch() == "ia64":
+    if not rhpl.getArch() == "ia64":
         return None
     if makeDevNode:
         makeDevInode(device, "/tmp/disk")
diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py
index 00c31d698..0534355e3 100644
--- a/iw/upgrade_migratefs_gui.py
+++ b/iw/upgrade_migratefs_gui.py
@@ -20,6 +20,7 @@ import string
 import isys 
 import iutil
 import upgrade
+import rhpl
 from fsset import *
 import gui
 import gtk
@@ -29,6 +30,9 @@ class UpgradeMigrateFSWindow (InstallWindow):
 
     def getNext (self):
         for entry in self.migent:
+            if rhpl.getArch() == "ia64" \
+                    and entry.getMountPoint() == "/boot/efi":
+                continue
             entry.setFormat(0)
             entry.setMigrate(0)
             entry.fsystem = entry.origfsystem
@@ -66,6 +70,9 @@ class UpgradeMigrateFSWindow (InstallWindow):
         cbox = gtk.VBox(False, 5)
         self.cbs = []
         for entry in self.migent:
+            if rhpl.getArch() == "ia64" \
+                    and entry.getMountPoint() == "/boot/efi":
+                continue
             if entry.fsystem.getName() != entry.origfsystem.getName():
                 migrating = 1
             else:
diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py
index 5a8d64cfa..61c55769e 100644
--- a/textw/upgrade_text.py
+++ b/textw/upgrade_text.py
@@ -24,6 +24,7 @@ import upgradeclass
 UpgradeClass = upgradeclass.InstallClass
 
 from rhpl.translate import _
+import rhpl
 
 class UpgradeMigrateFSWindow:
     def __call__ (self, screen, anaconda):
@@ -45,6 +46,9 @@ class UpgradeMigrateFSWindow:
 
         partlist = CheckboxTree(height=4, scroll=1)
         for entry in migent:
+            if rhpl.getArch() == "ia64" \
+                    and entry.getMountPoint() == "/boot/efi":
+                continue
             if entry.fsystem.getName() != entry.origfsystem.getName():
                 migrating = 1
             else:
@@ -71,6 +75,9 @@ class UpgradeMigrateFSWindow:
 
             # reset
             for entry in migent:
+                if rhpl.getArch() == "ia64" \
+                        and entry.getMountPoint() == "/boot/efi":
+                    continue
                 entry.setFormat(0)
                 entry.setMigrate(0)
                 entry.fsystem = entry.origfsystem
diff --git a/upgrade.py b/upgrade.py
index 17fdb156b..dc95ff881 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -218,7 +218,9 @@ def bindMountDevDirectory(instPath):
 # returns None if no filesystem exist to migrate
 def upgradeMigrateFind(anaconda):
     migents = anaconda.id.fsset.getMigratableEntries()
-    if not migents or len(migents) < 1:
+    if not migents or len(migents) < 1 or \
+            (rhpl.getArch() == "ia64" and len(migents) == 1 and \
+             migents[0].getMountPoint() == "/boot/efi"):
         anaconda.dispatch.skipStep("upgrademigratefs")
     else:
         anaconda.dispatch.skipStep("upgrademigratefs", skip = 0)