1) more fixups for upgrades: fix step list to actually run the transaction,

    set the upgrade flag in id when we get picked
2)  removed self from migrateXinetd
3)  moved GUI splash screen to its own file - this should make it pop up
    even faster.
4)  copyright notices in anaconda, splashscreen.py
5)  reworked the dep checker to build a new ts every time we make a pass.
    RPM doesn't seem to like to have a package in the ts as available *and*
    upgrade/install.
6)  fixed fstab reading for 'none' devices
7)  removed a debugging print from xf86config.py
8)  removed threadding import from progress_gui.py

1 files changed, 11 insertions, 3 deletions

diff --git a/fsset.py b/fsset.py
index 691f33ad6..42c583670 100644
--- a/fsset.py
+++ b/fsset.py
@@ -847,6 +847,7 @@ class LoopbackDevice(Device):
     def getComment (self):
         return "# LOOP1: %s %s /redhat.img\n" % (self.host, self.hostfs)
 
+# XXX fix RAID
 def readFstab (path):
     fsset = FileSystemSet()
 
@@ -894,13 +895,18 @@ def readFstab (path):
 	# all valid fstab entries have 6 fields
 	if len (fields) < 4 or len (fields) > 6: continue
 
+        # if we don't support mounting the filesystem, continue
         if not fileSystemTypes.has_key(fields[2]):
 	    continue
 	if string.find(fields[3], "noauto") != -1: continue
 
         fsystem = fileSystemTypeGet(fields[2])
         label = None
-	if len(fields) >= 6 and fields[0][:6] == "LABEL=":
+
+
+	if fields[0] == "none":
+            device = Device()
+        elif len(fields) >= 6 and fields[0][:6] == "LABEL=":
             label = fields[0][6:]
             if labelToDevice.has_key(label):
                 device = PartitionDevice(labelToDevice[label])
@@ -926,9 +932,11 @@ def readFstab (path):
 	    if loopIndex.has_key(device):
 		(dev, fs) = loopIndex[device]
                 device = LoopbackDevice(dev, fs)
-	else:
+	elif fields[0][:5] == "/dev/":
             device = PartitionDevice(fields[0][5:])
-            
+	else:
+            continue
+        
         entry = FileSystemSetEntry(device, fields[1], fsystem, fields[3])
         if label:
             entry.setLabel(label)