From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Wed, 17 Nov 2010 13:51:12 +0000 (+0100)
Subject: fix more nfiflash media paths to be non-absolute (#620)
X-Git-Tag: exp-2010.12~26^2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/665611070aead66a845b42e4b8912bcc45bc5602

fix more nfiflash media paths to be non-absolute (#620)
---

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
index 34f87256..85ecc92d 100644
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
@@ -16,7 +16,7 @@ from Components.MultiContent import MultiContentEntryText
 from Components.ScrollLabel import ScrollLabel
 from Components.Harddisk import harddiskmanager
 from Components.Task import Task, Job, job_manager, Condition
-from Tools.Directories import fileExists, isMount, resolveFilename, SCOPE_HDD
+from Tools.Directories import fileExists, isMount, resolveFilename, SCOPE_HDD, SCOPE_MEDIA
 from Tools.HardwareInfo import HardwareInfo
 from Tools.Downloader import downloadWithProgress
 from enigma import eConsoleAppContainer, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_VALIGN_CENTER, RT_WRAP, eTimer
@@ -391,7 +391,7 @@ class NFIDownload(Screen):
 		
 		self.box = HardwareInfo().get_device_name()
 		self.feed_base = "http://www.dreamboxupdate.com/opendreambox" #/1.5/%s/images/" % self.box	
-		self.usbmountpoint = "/mnt/usb/"
+		self.usbmountpoint = resolveFilename(SCOPE_MEDIA)+"usb/"
 
 		self.menulist = []
 
@@ -570,7 +570,7 @@ class NFIDownload(Screen):
 
 	def ackedDestination(self):
 		print "[ackedDestination]", self.branch, self.target_dir
-		self.container.setCWD("/mnt")
+		self.container.setCWD(resolveFilename(SCOPE_MEDIA)+"usb/")
 		if self.target_dir[:8] == "/autofs/":
 			self.target_dir = "/dev/" + self.target_dir[8:-1]
 
@@ -796,9 +796,10 @@ def main(session, **kwargs):
 
 def filescan_open(list, session, **kwargs):
 	dev = "/dev/" + (list[0].path).rsplit('/',1)[0][7:]
-	print "mounting device " + dev + " to /mnt/usb..."
-	system("mount "+dev+" /mnt/usb/ -o rw,sync")
-	session.open(NFIDownload,"/mnt/usb/")
+	print "mounting device " + dev + " to /media/usb..."
+	usbmountpoint = resolveFilename(SCOPE_MEDIA)+"usb/"
+	system("mount %s %s -o rw,sync" % (dev, usbmountpoint))
+	session.open(NFIDownload,usbmountpoint)
 
 def filescan(**kwargs):
 	from Components.Scanner import Scanner, ScanPath