preliminary 'coldplug' support

[enigma2.git] / lib / python / Components / Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index b1016812a449ea54f4bc7a9469277e9f52900c86..e5f547ab2f5121926f461108496b56cba45d82d3 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -42,24 +42,29 @@ class Harddisk:
                else:
                        return ret + "Master"
 
-       def capacity(self):
+       def diskSize(self):
                procfile = tryOpen(self.prochdx + "capacity")
-               
+
                if procfile == "":
-                       return ""
+                       return 0
 
                line = procfile.readline()
                procfile.close()
-               
+
                try:
                        cap = int(line)
                except:
+                       return 0
+
+               return cap / 1000 * 512 / 1000
+
+       def capacity(self):
+               cap = self.diskSize()
+               if cap == 0:
                        return ""
                
-               cap = cap / 1000 * 512 / 1000
-               
                return "%d.%03d GB" % (cap/1024, cap%1024)
-                                                               
+
        def model(self):
                procfile = tryOpen(self.prochdx + "model")
 
@@ -132,7 +137,10 @@ class Harddisk:
                return 0
 
        def mkfs(self):
-               cmd = "/sbin/mkfs.ext3 -T largefile -m0 " + self.devidex + "part1"
+               cmd = "/sbin/mkfs.ext3 "
+               if self.diskSize() > 4 * 1024:
+                       cmd += "-T largefile "
+               cmd += "-m0 " + self.devidex + "part1"
                res = system(cmd)
                return (res >> 8)
 
@@ -257,6 +265,8 @@ class HarddiskManager:
                                hdd = Harddisk(hddNum)
                                self.hdd.append(hdd)
 
+               self.enumerateBlockDevices()
+
                SystemInfo["Harddisc"] = len(self.hdd) > 0
 
                # currently, this is just an enumeration of what's possible,
@@ -278,6 +288,49 @@ class HarddiskManager:
                for x in p:
                        self.partitions.append(Partition(mountpoint = x[0], description = x[1]))
 
+       def enumerateBlockDevices(self):
+               print "enumerating block devices..."
+               import os
+               for blockdev in os.listdir("/sys/block"):
+                       devpath = "/sys/block/" + blockdev
+                       error = False
+                       removable = False
+                       blacklisted = False
+                       is_cdrom = False
+                       partitions = []
+                       try:
+                               removable = bool(int(open(devpath + "/removable").read()))
+                               dev = int(open(devpath + "/dev").read().split(':')[0])
+                               if dev in [7, 31]: # loop, mtdblock
+                                       blacklisted = True
+                               if blockdev[0:2] == 'sr':
+                                       is_cdrom = True
+                               if blockdev[0:2] == 'hd':
+                                       try:
+                                               media = open("/proc/ide/%s/media" % blockdev).read()
+                                               if media.find("cdrom") != -1:
+                                                       is_cdrom = True
+                                       except IOError:
+                                               error = True
+                               # check for partitions
+                               if not is_cdrom:
+                                       for partition in os.listdir(devpath):
+                                               if partition[0:len(blockdev)] != blockdev:
+                                                       continue
+                                               partitions.append(partition)
+                       except IOError:
+                               error = True
+                       print "found block device '%s':" % blockdev, 
+                       if error:
+                               print "error querying properties"
+                       elif blacklisted:
+                               print "blacklisted"
+                       else:
+                               print "ok, removable=%s, cdrom=%s, partitions=%s" % (removable, is_cdrom, partitions)
+                               self.addHotplugPartition(blockdev, blockdev)
+                               for part in partitions:
+                                       self.addHotplugPartition(part, part)
+
        def getAutofsMountpoint(self, device):
                return "/autofs/%s/" % (device)