fixed so we just ignore RAID booting when doing maximum cylinder test, also fixed some problems in rescue mode

1 files changed, 15 insertions, 3 deletions

diff --git a/fstab.py b/fstab.py
index 8d878f78f..45bf62180 100644
--- a/fstab.py
+++ b/fstab.py
@@ -168,7 +168,12 @@ class Fstab:
 	bootpart = self.getBootDevice()
 	boothd = self.getMbrDevice()
 
-        maxcyl = None
+        # for now just assume this will work on RAID systems, not simple to
+        # test at all
+	if bootpart[0:2] == "md":
+            return 0
+
+        maxcyl = 0
         
         try:
             bootgeom = isys.getGeometry(boothd)
@@ -204,14 +209,21 @@ class Fstab:
     def getBootPartitionMaxCylFromDesired(self):
 	bootpart = self.getBootDevice()
 	boothd = self.getMbrDevice()
+
+        # for now just assume this will work on RAID systems, not simple to
+        # test at all
+	if bootpart[0:2] == "md":
+            return 0
+
+
         (drives, raid) = self.partitionList()
 
         for (dev, devName, type, start, size, maxcyl, preexist) in drives:
             if dev == bootpart:
-#                log ("maxcyl of %s is %d" % (dev, maxcyl))
+                log ("maxcyl of %s is %s" % (dev, maxcyl))
                 return maxcyl
 
-        return None
+        return 0
 
     def getMbrDevice(self):
 	return self.driveList()[0]