diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2008-12-02 21:44:34 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2008-12-02 21:44:34 +0100 |
| commit | d630d7d7715a6fbc97c1d322ceb2bc0452ab0740 (patch) | |
| tree | a04a5dc528e679ddc22bfeea8ab6b87dd950923d /lib/python/Components/Harddisk.py | |
| parent | bcd91e419bd46b9194459a80eb8c6454250eb307 (diff) | |
| parent | 5f5bf69803be617adb7364f61c6eed9fd32d6d14 (diff) | |
| download | enigma2-d630d7d7715a6fbc97c1d322ceb2bc0452ab0740.tar.gz enigma2-d630d7d7715a6fbc97c1d322ceb2bc0452ab0740.zip | |
Merge branch 'master' into enigma2_rel25
Diffstat (limited to 'lib/python/Components/Harddisk.py')
| -rw-r--r-- | lib/python/Components/Harddisk.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index f7c3a7cb..febd16dd 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -19,20 +19,22 @@ class Harddisk: s_minor = int(tmp[1]) for disc in listdir("/dev/discs"): path = readlink('/dev/discs/'+disc) - devidex = '/dev'+path[2:]+'/' - disc = devidex+'disc' + devidex = '/dev/discs/'+disc+'/' + devidex2 = '/dev'+path[2:]+'/' + disc = devidex2+'disc' ret = stat(disc).st_rdev if s_major == major(ret) and s_minor == minor(ret): self.devidex = devidex - print "new Harddisk", device, self.devidex + self.devidex2 = devidex2 + print "new Harddisk", device, '->', self.devidex, '->', self.devidex2 break def __lt__(self, ob): return self.device < ob.device def bus(self): - ide_cf = self.device.find("hd") == 0 and self.devidex.find("host0") == -1 # 7025 specific - internal = self.device.find("hd") == 0 and self.devidex + ide_cf = self.device.find("hd") == 0 and self.devidex2.find("host0") == -1 # 7025 specific + internal = self.device.find("hd") == 0 if ide_cf: ret = "External (CF)" elif internal: |