git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix pid changes
[enigma2.git]
/
lib
/
python
/
Components
/
Harddisk.py
diff --git
a/lib/python/Components/Harddisk.py
b/lib/python/Components/Harddisk.py
index 8664f79a48b7cc6a980122d4a04faf3a1699f5ff..6148caac93e9146d3ad2c68da633ea9b8f6e7961 100755
(executable)
--- a/
lib/python/Components/Harddisk.py
+++ b/
lib/python/Components/Harddisk.py
@@
-70,7
+70,7
@@
class Harddisk:
cap = self.diskSize()
if cap == 0:
return ""
cap = self.diskSize()
if cap == 0:
return ""
- return "%d.%03d GB" % (cap/10
24, cap%1024
)
+ return "%d.%03d GB" % (cap/10
00, cap%1000
)
def model(self):
if self.device[:2] == "hd":
def model(self):
if self.device[:2] == "hd":
@@
-156,14
+156,20
@@
class Harddisk:
cmd = "/sbin/mkfs.ext3 "
if self.diskSize() > 4 * 1024:
cmd += "-T largefile "
cmd = "/sbin/mkfs.ext3 "
if self.diskSize() > 4 * 1024:
cmd += "-T largefile "
- cmd += "-m0 " + self.devidex + "part1"
+ cmd += "-m0
-O dir_index
" + self.devidex + "part1"
res = system(cmd)
return (res >> 8)
def mount(self):
res = system(cmd)
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:
def createMovieFolder(self):
try:
@@
-230,9
+236,8
@@
class Harddisk:
# we set the hdd into standby.
def readStats(self):
l = open("/sys/block/%s/stat" % self.device).read()
# we set the hdd into standby.
def readStats(self):
l = open("/sys/block/%s/stat" % self.device).read()
- nr_read = int(l[:8].strip())
- nr_write = int(l[4*9:4*9+8].strip())
- return nr_read, nr_write
+ (nr_read, _, _, _, nr_write) = l.split()[:5]
+ return int(nr_read), int(nr_write)
def startIdle(self):
self.last_access = time.time()
def startIdle(self):
self.last_access = time.time()
@@
-456,11
+461,10
@@
class HarddiskManager:
self.on_partition_list_change("remove", x)
l = len(device)
if l and not device[l-1].isdigit():
self.on_partition_list_change("remove", x)
l = len(device)
if l and not device[l-1].isdigit():
- idx = 0
for hdd in self.hdd:
if hdd.device == device:
for hdd in self.hdd:
if hdd.device == device:
-
self.hdd[x]
.stop()
- del self.hdd[idx]
+
hdd
.stop()
+ self.hdd.remove(hdd)
break
SystemInfo["Harddisk"] = len(self.hdd) > 0
break
SystemInfo["Harddisk"] = len(self.hdd) > 0