Patch by pieterg: try both device names for mounting via fstab

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index ad6c1a3b46e5f3f752ebe08e5845b4fa8acfd427..df14276bdaa257e34638b8c989386783796666fa 100755 (executable)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -161,9 +161,15 @@ class Harddisk:
                return (res >> 8)
 
        def mount(self):
-               cmd = "/bin/mount -t ext3 " + self.devidex + "part1"
-               res = system(cmd)
-               return (res >> 8)
+               res = -1
+               #we don't know which type of devicename is used in fstab, try both
+               for device in [self.devidex, self.devidex2]:
+                       cmd = "/bin/mount -t ext3 " + device + "part1"
+                       res = system(cmd)
+                       res >>= 8
+                       if not res:
+                               break
+               return res
 
        def createMovieFolder(self):
                try: