From: Felix Domke <tmbinc@elitedvb.net>
Date: Sun, 26 Apr 2009 21:24:35 +0000 (+0200)
Subject: Patch by pieterg: try both device names for mounting via fstab
X-Git-Tag: 2.6.0~328
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/6860bccf8a14d5cea270b6bb0823e2f9cf90f060

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 ad6c1a3b..df14276b 100755
--- 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: