-from os import system, listdir, statvfs, popen, makedirs, readlink, stat, major, minor
-from Tools.Directories import SCOPE_HDD, resolveFilename
+from os import system, listdir, statvfs, popen, makedirs, stat, major, minor, path, access
+
+from Tools.Directories import SCOPE_HDD, resolveFilename, fileExists
+
from Tools.CList import CList
from SystemInfo import SystemInfo
import time
from Components.Console import Console
+import os
+import glob
+
+def MajorMinor(path):
+ rdev = stat(path).st_rdev
+ return (major(rdev),minor(rdev))
-def tryOpen(filename):
+def readFile(filename):
+ file = open(filename)
+ data = file.read().strip()
+ file.close()
+ return data
+
+def getProcMounts():
+ try:
+ mounts = open("/proc/mounts", 'r')
+ except IOError, ex:
+ print "[Harddisk] Failed to open /proc/mounts", ex
+ return []
+ result = [line.strip().split(' ') for line in mounts]
+ for item in result:
+ # Spaces are encoded as \040 in mounts
+ item[1] = item[1].replace('\\040', ' ')
+ return result
+
+def CheckSfdiskVer():
+ cmd = 'sfdisk --version'
+ lines = popen(cmd).readlines()
+ for l in lines:
+ if l.find("sfdisk from util-linux") != -1:
+ ver = l.split()[-1].strip()
+ break
try:
- procFile = open(filename)
- except IOError:
- return ""
- return procFile
+ vs = ver.split('.')
+ if len(vs) > 2:
+ ver = '.'.join(vs[:2])
+
+ ver = float(ver)
+ except:
+ print "[CheckSfdiskVer] check parted version Failed!"
+ return 0
+ return ver
+
+def enableUdevEvent(enable = True):
+ if enable:
+ option = '--start-exec-queue'
+ else:
+ option = '--stop-exec-queue'
+ cmd = "udevadm control %s" % option
+ print "CMD : ", cmd
+ system(cmd)
+
+def findMountPoint(path):
+ 'Example: findMountPoint("/media/hdd/some/file") returns "/media/hdd"'
+ path = os.path.abspath(path)
+ while not os.path.ismount(path):
+ path = os.path.dirname(path)
+ return path
+
+def getDeviceFile(dev_path):
+ for parts in getProcMounts():
+ if os.path.realpath(parts[1]).startswith(dev_path):
+ return parts[0]
+
+def getMountPath(mountPath):
+ mountPath = os.path.realpath(mountPath)
+ while not os.path.ismount(mountPath):
+ mountPath = os.path.dirname(mountPath)
+
+ return mountPath
+
+def getDeviceInterface(mountPath):
+ mountPath = getMountPath(mountPath)
+
+ if mountPath == '/':
+ return None
+
+ from Components.Harddisk import getDeviceFile
+ dev = getDeviceFile(mountPath)
+
+ if dev and dev.startswith("/dev/sd"):
+ dev = os.path.basename(dev)
+ phyPath = os.path.realpath('/sys/block/' + dev[:3])
+
+ # check usb
+ for x in glob.glob("/sys/bus/usb/devices/usb*"):
+ if phyPath.find(os.path.realpath(x)) != -1:
+ from Tools.HardwareInfo import HardwareInfo
+ if (HardwareInfo().get_vu_device_name() == "zero4k") and (phyPath.find("f0b00500.ehci_v2/usb2/2-1") != -1):
+ return "ata"
+ else:
+ return "usb"
+
+ # check ata
+ if phyPath.find("/ata") != -1:
+ return "ata"
+
+ return None
+
+def isUsbStorage(dirname):
+ return getDeviceInterface(dirname) in (None, "usb")
+
+DEVTYPE_UDEV = 0
+DEVTYPE_DEVFS = 1
class Harddisk:
def __init__(self, device):
self.device = device
- procfile = tryOpen("/sys/block/"+self.device+"/dev")
- tmp = procfile.readline().split(':')
- s_major = int(tmp[0])
- s_minor = int(tmp[1])
+
+ if access("/dev/.udev", 0):
+ self.type = DEVTYPE_UDEV
+ elif access("/dev/.devfsd", 0):
+ self.type = DEVTYPE_DEVFS
+ else:
+ print "Unable to determine structure of /dev"
+
self.max_idle_time = 0
self.idle_running = False
self.timer = None
- for disc in listdir("/dev/discs"):
- path = readlink('/dev/discs/'+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
- self.devidex2 = devidex2
- print "new Harddisk", device, '->', self.devidex, '->', self.devidex2
- self.startIdle()
- break
+
+ self.dev_path = ''
+ self.disk_path = ''
+ self.mount_path = None
+ self.mount_device = None
+ self.phys_path = path.realpath(self.sysfsPath('device'))
+
+ if self.type == DEVTYPE_UDEV:
+ self.dev_path = '/dev/' + self.device
+ self.disk_path = self.dev_path
+
+ elif self.type == DEVTYPE_DEVFS:
+ tmp = readFile(self.sysfsPath('dev')).split(':')
+ s_major = int(tmp[0])
+ s_minor = int(tmp[1])
+ for disc in listdir("/dev/discs"):
+ dev_path = path.realpath('/dev/discs/' + disc)
+ disk_path = dev_path + '/disc'
+ try:
+ rdev = stat(disk_path).st_rdev
+ except OSError:
+ continue
+ if s_major == major(rdev) and s_minor == minor(rdev):
+ self.dev_path = dev_path
+ self.disk_path = disk_path
+ break
+
+ print "new Harddisk", self.device, '->', self.dev_path, '->', self.disk_path
+ self.startIdle()
def __lt__(self, ob):
return self.device < ob.device
+ def partitionPath(self, n):
+ if self.type == DEVTYPE_UDEV:
+ return self.dev_path + n
+ elif self.type == DEVTYPE_DEVFS:
+ return self.dev_path + '/part' + n
+
+ def sysfsPath(self, filename):
+ return path.realpath('/sys/block/' + self.device + '/' + filename)
+
def stop(self):
if self.timer:
self.timer.stop()
self.timer.callback.remove(self.runIdle)
def bus(self):
- ide_cf = self.device[:2] == "hd" and "host0" not in self.devidex2 # 7025 specific
- internal = self.device[:2] == "hd"
+ # CF (7025 specific)
+ if self.type == DEVTYPE_UDEV:
+ ide_cf = False # FIXME
+ elif self.type == DEVTYPE_DEVFS:
+ ide_cf = self.device[:2] == "hd" and "host0" not in self.dev_path
+
+ internal = "pci" in self.phys_path
+
if ide_cf:
ret = "External (CF)"
elif internal:
return ret
def diskSize(self):
- procfile = tryOpen("/sys/block/"+self.device+"/size")
- if procfile == "":
- return 0
- line = procfile.readline()
- procfile.close()
+ try:
+ line = readFile(self.sysfsPath('size'))
+ except:
+ harddiskmanager.removeHotplugPartition(self.device)
+ print "error remove",self.device
+ return -1
try:
cap = int(line)
except:
cap = self.diskSize()
if cap == 0:
return ""
- return "%d.%03d GB" % (cap/1024, cap%1024)
+ return "%d.%03d GB" % (cap/1000, cap%1000)
def model(self):
- if self.device[:2] == "hd":
- procfile = tryOpen("/proc/ide/"+self.device+"/model")
- if procfile == "":
- return ""
- line = procfile.readline()
- procfile.close()
- return line.strip()
- elif self.device[:2] == "sd":
- procfile = tryOpen("/sys/block/"+self.device+"/device/vendor")
- if procfile == "":
- return ""
- vendor = procfile.readline().strip()
- procfile.close()
- procfile = tryOpen("/sys/block/"+self.device+"/device/model")
- model = procfile.readline().strip()
- return vendor+'('+model+')'
- else:
- assert False, "no hdX or sdX"
+ try:
+ if self.device[:2] == "hd":
+ return readFile('/proc/ide/' + self.device + '/model')
+ elif self.device[:2] == "sd":
+ vendor = readFile(self.sysfsPath('device/vendor'))
+ model = readFile(self.sysfsPath('device/model'))
+ return vendor + '(' + model + ')'
+ else:
+ assert False, "no hdX or sdX"
+ except:
+ harddiskmanager.removeHotplugPartition(self.device)
+ print "error remove",self.device
+ return -1
def free(self):
- procfile = tryOpen("/proc/mounts")
-
- if procfile == "":
+ try:
+ mounts = open("/proc/mounts")
+ except IOError:
return -1
- free = -1
- while 1:
- line = procfile.readline()
- if line == "":
- break
- if line.startswith(self.devidex) or line.startswith(self.devidex2):
- parts = line.strip().split(" ")
- try:
+ lines = mounts.readlines()
+ mounts.close()
+
+ for line in lines:
+ parts = line.strip().split(" ")
+ real_path = path.realpath(parts[0])
+ if not real_path[-1].isdigit():
+ continue
+ try:
+ if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])):
stat = statvfs(parts[1])
- except OSError:
- continue
- free = stat.f_bfree/1000 * stat.f_bsize/1000
- break
- procfile.close()
- return free
+ return stat.f_bfree/1000 * stat.f_bsize/1000
+ except OSError:
+ pass
+ return -1
def numPartitions(self):
- try:
- idedir = listdir(self.devidex)
- except OSError:
- return -1
numPart = -1
- for filename in idedir:
- if filename.startswith("disc"):
- numPart += 1
- if filename.startswith("part"):
- numPart += 1
+ if self.type == DEVTYPE_UDEV:
+ try:
+ devdir = listdir('/dev')
+ except OSError:
+ return -1
+ for filename in devdir:
+ if filename.startswith(self.device):
+ numPart += 1
+
+ elif self.type == DEVTYPE_DEVFS:
+ try:
+ idedir = listdir(self.dev_path)
+ except OSError:
+ return -1
+ for filename in idedir:
+ if filename.startswith("disc"):
+ numPart += 1
+ if filename.startswith("part"):
+ numPart += 1
return numPart
- def unmount(self):
- procfile = tryOpen("/proc/mounts")
+ def mountDevice(self):
+ for parts in getProcMounts():
+ if path.realpath(parts[0]).startswith(self.dev_path):
+ self.mount_device = parts[0]
+ self.mount_path = parts[1]
+ return parts[1]
+
+ def findMount(self):
+ if self.mount_path is None:
+ return self.mountDevice()
+ return self.mount_path
- if procfile == "":
+ def unmount(self):
+ try:
+ mounts = open("/proc/mounts")
+ except IOError:
return -1
- cmd = "/bin/umount"
+ lines = mounts.readlines()
+ mounts.close()
- for line in procfile:
- if line.startswith(self.devidex) or line.startswith(self.devidex2):
- parts = line.split()
- cmd = ' '.join([cmd, parts[1]])
+ cmd = "umount"
- procfile.close()
+ for line in lines:
+ parts = line.strip().split(" ")
+ real_path = path.realpath(parts[0])
+ if not real_path[-1].isdigit():
+ continue
+ try:
+ if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])):
+ cmd = ' ' . join([cmd, parts[1]])
+ break
+ except OSError:
+ pass
res = system(cmd)
+ print "CMD : ", cmd
+ return (res >> 8)
+
+ def checkPartionPath(self, path):
+ import time, os
+ for i in range(1,10):
+ if os.path.exists(path):
+ return True
+ time.sleep(1)
+ return False
+
+ def updatePartition(self):
+ sfdiskVer = CheckSfdiskVer()
+ if sfdiskVer < 2.26: # sfdisk -R option is deprecated at sfdiskVer >= 2.26
+ cmd = 'sfdisk -R %s; sleep 5' % (self.disk_path)
+ elif path.exists('/usr/sbin/partprobe'):
+ cmd = 'partprobe %s; sleep 5' % (self.disk_path)
+ elif path.exists('/usr/sbin/partx'):
+ cmd = 'partx -u %s' % (self.disk_path)
+ else:
+ return -1
+
+ print "CMD : ", cmd
+ res = system(cmd)
+
return (res >> 8)
def createPartition(self):
- cmd = "/sbin/sfdisk -f " + self.devidex + "disc"
- sfdisk = popen(cmd, "w")
- sfdisk.write("0,\n;\n;\n;\ny\n")
- sfdisk.close()
- return 0
+ def CheckPartedVer():
+ cmd = 'parted --version'
+ lines = popen(cmd).readlines()
+ for l in lines:
+ if l.find("parted (GNU parted)") != -1:
+ ver = l.split()[3].strip()
+ break
+ try:
+ ver = float(ver)
+ except:
+ print "[CheckPartedVer] check parted version Failed!"
+ return 0
+ return ver
+
+ disk_size = self.diskSize()
+
+ if disk_size > 2.2 * 1000 * 1000: # if 2.2 TB
+ setAlign = ""
+ partedVer = CheckPartedVer()
+ if partedVer >= 2.1: # align option is supported in version 2.1 or later
+ setAlign = "--align optimal"
+ cmd = 'parted %s %s --script mklabel gpt mkpart disk ext2 0%% 100%%' % ( setAlign, self.disk_path )
+
+ else:
+ sfdiskVer = CheckSfdiskVer()
+ if sfdiskVer <= 2.21:
+ cmd = 'printf "8,\n;0,0\n;0,0\n;0,0\ny\n" | sfdisk -f -uS ' + self.disk_path
+ else:
+ cmd = 'printf "8,\nquit\nY\n" | sfdisk -f -uS ' + self.disk_path
+
+ print "CMD : ", cmd
+ res = system(cmd)
+
+ if not self.checkPartionPath(self.partitionPath("1")):
+ print "no exist : ", self.partitionPath("1")
+ return 1
+ return (res >> 8)
def mkfs(self):
- cmd = "/sbin/mkfs.ext3 "
+ cmd = "mkfs.ext3 "
if self.diskSize() > 4 * 1024:
cmd += "-T largefile "
- cmd += "-m0 " + self.devidex + "part1"
+ cmd += "-m0 -O dir_index " + self.partitionPath("1")
+ print "CMD : ", cmd
res = system(cmd)
return (res >> 8)
def mount(self):
- cmd = "/bin/mount -t ext3 " + self.devidex + "part1"
+ try:
+ fstab = open("/etc/fstab")
+ except IOError:
+ return -1
+
+ lines = fstab.readlines()
+ fstab.close()
+
+ res = -1
+ mount_point = None
+ for line in lines:
+ parts = line.strip().split(" ")
+ real_path = path.realpath(parts[0])
+ if not real_path[-1].isdigit():
+ continue
+ try:
+ if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])):
+ mount_point = parts[0]
+ break
+ except OSError:
+ pass
+
+ if mount_point is None:
+ return 0
+
+ cmd = "mount -t ext3 " + mount_point
+ print "CMD : ", cmd
res = system(cmd)
- return (res >> 8)
+
+ if (res >> 8) != 0:
+ return -3
+
+ if self.createMovieFolder() != 0:
+ return -4
+
+ return 0
def createMovieFolder(self):
try:
+ if not fileExists("/hdd", 0):
+ print "not found /hdd"
+ system("ln -s /media/hdd /hdd")
+
makedirs(resolveFilename(SCOPE_HDD))
except OSError:
return -1
def fsck(self):
# We autocorrect any failures
# TODO: we could check if the fs is actually ext3
- cmd = "/sbin/fsck.ext3 -f -p " + self.devidex + "part1"
+ cmd = "fsck.ext3 -f -p " + self.partitionPath("1")
res = system(cmd)
return (res >> 8)
- errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Fsck failed"), _("Please Reboot"), _("Filesystem contains uncorrectable errors"), _("Unmount failed")]
+ def killPartition(self, n):
+ part = self.partitionPath(n)
+
+ if access(part, 0):
+ cmd = 'dd bs=512 count=3 if=/dev/zero of=' + part
+ print "CMD : ", cmd
+ res = system(cmd)
+ else:
+ res = 0
+
+ return (res >> 8)
+
+ errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Fsck failed"), _("Please Reboot"), _("Filesystem contains uncorrectable errors"), _("Unmount failed"), _("partx failed")]
def initialize(self):
+ enableUdevEvent(False)
self.unmount()
- if self.createPartition() != 0:
- return -1
+ # Udev tries to mount the partition immediately if there is an
+ # old filesystem on it when fdisk reloads the partition table.
+ # To prevent that, we overwrite the first 3 sectors of the
+ # partition, if the partition existed before. That's enough for
+ # ext3 at least.
+ self.killPartition("1")
- if self.mkfs() != 0:
- return -2
+ if self.updatePartition() != 0:
+ res = -9
- if self.mount() != 0:
- return -3
+ elif self.createPartition() != 0:
+ res = -1
- if self.createMovieFolder() != 0:
- return -4
+ elif self.updatePartition() != 0:
+ res = -9
- return 0
+ elif self.mkfs() != 0:
+ res = -2
+
+ else:
+ res = self.mount()
+
+ enableUdevEvent(True)
+ return res
def check(self):
self.unmount()
return -3
return 0
-
+
def getDeviceDir(self):
- return self.devidex
-
+ return self.dev_path
+
def getDeviceName(self):
- return self.getDeviceDir() + "disc"
+ return self.disk_path
# the HDD idle poll daemon.
# as some harddrives have a buggy standby timer, we are doing this by hand here.
# any access has been made to the disc. If there has been no access over a specifed time,
# we set the hdd into standby.
def readStats(self):
- l = open("/sys/block/%s/stat" % self.device).read()
+ try:
+ l = open("/sys/block/%s/stat" % self.device).read()
+ except IOError:
+ return -1,-1
(nr_read, _, _, _, nr_write) = l.split()[:5]
return int(nr_read), int(nr_write)
from enigma import eTimer
# disable HDD standby timer
- Console().ePopen(("hdparm", "hdparm", "-S0", (self.devidex + "disc")))
+ Console().ePopen(("hdparm", "hdparm", "-S0", self.disk_path))
self.timer = eTimer()
self.timer.callback.append(self.runIdle)
self.idle_running = True
idle_time = t - self.last_access
stats = self.readStats()
+
+ if stats == -1:
+ self.setIdleTime(0)
+ return
print "nr_read", stats[0], "nr_write", stats[1]
l = sum(stats)
print "sum", l, "prev_sum", self.last_stat
- if l != self.last_stat: # access
+ if l != self.last_stat and l >= 0: # access
print "hdd was accessed since previous check!"
self.last_stat = l
self.last_access = t
self.is_sleeping = True
def setSleep(self):
- Console().ePopen(("hdparm", "hdparm", "-y", (self.devidex + "disc")))
+ Console().ePopen(("hdparm", "hdparm", "-y", self.disk_path))
def setIdleTime(self, idle):
self.max_idle_time = idle
return s.f_bavail * s.f_bsize
except OSError:
return None
-
+
def total(self):
try:
s = self.stat()
# TODO: can os.path.ismount be used?
if self.force_mounted:
return True
- procfile = tryOpen("/proc/mounts")
- for n in procfile.readlines():
- if n.split(' ')[1] == self.mountpoint:
+
+ try:
+ mounts = open("/proc/mounts")
+ except IOError:
+ return False
+
+ lines = mounts.readlines()
+ mounts.close()
+
+ for line in lines:
+ if line.split(' ')[1] == self.mountpoint:
return True
return False
-DEVICEDB = \
+DEVICEDB_SR = \
+ {"dm8000":
+ {
+ "/devices/pci0000:01/0000:01:00.0/host0/target0:0:0/0:0:0:0": _("DVD Drive"),
+ "/devices/pci0000:01/0000:01:00.0/host1/target1:0:0/1:0:0:0": _("DVD Drive"),
+ "/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/host3/target3:0:0/3:0:0:0": _("DVD Drive"),
+ },
+ "dm800":
+ {
+ },
+ "dm7025":
{
- # dm8000:
- "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": "Front USB Slot",
- "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": "Back, upper USB Slot",
- "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": "Back, lower USB Slot",
- "/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/host1/target1:0:0/1:0:0:0": "DVD Drive",
+ }
+ }
+
+DEVICEDB = \
+ {"dm8000":
+ {
+ "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": _("Front USB Slot"),
+ "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": _("Back, upper USB Slot"),
+ "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": _("Back, lower USB Slot"),
+ "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": _("Front USB Slot"),
+ "/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/": _("Internal USB Slot"),
+ "/devices/platform/brcm-ohci-1.1/usb4/4-1/4-1:1.0/": _("Internal USB Slot"),
+ },
+ "dm800":
+ {
+ "/devices/platform/brcm-ehci.0/usb1/1-2/1-2:1.0": "Upper USB Slot",
+ "/devices/platform/brcm-ehci.0/usb1/1-1/1-1:1.0": "Lower USB Slot",
+ },
+ "dm7025":
+ {
+ "/devices/pci0000:00/0000:00:14.1/ide1/1.0": "CF Card Slot", #hdc
+ "/devices/pci0000:00/0000:00:14.1/ide0/0.0": "Internal Harddisk"
+ }
}
class HarddiskManager:
self.hdd = [ ]
self.cd = ""
self.partitions = [ ]
-
+ self.devices_scanned_on_init = [ ]
+
self.on_partition_list_change = CList()
-
+
self.enumerateBlockDevices()
-
+
# currently, this is just an enumeration of what's possible,
# this probably has to be changed to support automount stuff.
# still, if stuff is mounted into the correct mountpoints by
- # external tools, everything is fine (until somebody inserts
+ # external tools, everything is fine (until somebody inserts
# a second usb stick.)
p = [
- ("/media/hdd", _("Harddisk")),
- ("/media/card", _("Card")),
+ ("/media/hdd", _("Harddisk")),
+ ("/media/card", _("Card")),
("/media/cf", _("Compact Flash")),
("/media/mmc1", _("MMC Card")),
("/media/net", _("Network Mount")),
("/media/usb", _("USB Stick")),
("/", _("Internal Flash"))
]
-
+
self.partitions.extend([ Partition(mountpoint = x[0], description = x[1]) for x in p ])
def getBlockDevInfo(self, blockdev):
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
+ removable = bool(int(readFile(devpath + "/removable")))
+ dev = int(readFile(devpath + "/dev").split(':')[0])
+ if dev in (7, 31, 179): # loop, mtdblock, mmcblock
blacklisted = True
if blockdev[0:2] == 'sr':
is_cdrom = True
if blockdev[0:2] == 'hd':
try:
- media = open("/proc/ide/%s/media" % blockdev).read()
+ media = readFile("/proc/ide/%s/media" % blockdev)
if "cdrom" in media:
is_cdrom = True
except IOError:
except IOError, err:
if err.errno == 159: # no medium present
medium_found = False
-
+
return error, blacklisted, removable, is_cdrom, partitions, medium_found
def enumerateBlockDevices(self):
print "enumerating block devices..."
for blockdev in listdir("/sys/block"):
- error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(blockdev)
- print "found block device '%s':" % blockdev,
- if error:
- print "error querying properties"
- elif blacklisted:
- print "blacklisted"
- elif not medium_found:
- print "no medium"
- else:
- print "ok, removable=%s, cdrom=%s, partitions=%s, device=%s" % (removable, is_cdrom, partitions, blockdev)
-
- self.addHotplugPartition(blockdev)
- for part in partitions:
- self.addHotplugPartition(part)
+ error, blacklisted, removable, is_cdrom, partitions, medium_found = self.addHotplugPartition(blockdev)
+ if not error and not blacklisted:
+ if medium_found:
+ for part in partitions:
+ self.addHotplugPartition(part)
+ self.devices_scanned_on_init.append((blockdev, removable, is_cdrom, medium_found))
def getAutofsMountpoint(self, device):
return "/autofs/%s/" % (device)
+
+ def is_hard_mounted(self, device):
+ mounts = file('/proc/mounts').read().split('\n')
+ for x in mounts:
+ if x.find('/autofs') == -1 and x.find(device) != -1:
+ return True
+ return False
+
+ def getMountpoint(self, device):
+ dev = "/dev/%s" % device
+ for item in getProcMounts():
+ if item[0] == dev and item[1].find('/autofs') == -1:
+ return item[1]
+ return None
+
def addHotplugPartition(self, device, physdev = None):
if not physdev:
dev, part = self.splitDeviceName(device)
try:
- physdev = readlink("/sys/block/" + dev + "/device")[5:]
+ physdev = path.realpath('/sys/block/' + dev + '/device')[4:]
except OSError:
physdev = dev
print "couldn't determine blockdev physdev for device", device
- # device is the device name, without /dev
- # physdev is the physical device path, which we (might) use to determine the userfriendly name
- description = self.getUserfriendlyDeviceName(device, physdev)
-
- p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True, device = device)
- self.partitions.append(p)
- self.on_partition_list_change("add", p)
+ error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(device)
+ print "found block device '%s':" % device,
- # see if this is a harddrive
- l = len(device)
- if l and not device[l-1].isdigit():
- error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(device)
- if not blacklisted and not removable and not is_cdrom and medium_found:
- self.hdd.append(Harddisk(device))
- self.hdd.sort()
- SystemInfo["Harddisk"] = len(self.hdd) > 0
+ if blacklisted:
+ print "blacklisted"
+ else:
+ if error:
+ print "error querying properties"
+ elif not medium_found:
+ print "no medium"
+ else:
+ print "ok, removable=%s, cdrom=%s, partitions=%s" % (removable, is_cdrom, partitions)
+
+ l = len(device)
+ if l:
+ # see if this is a harddrive
+ if not device[l-1].isdigit() and not removable and not is_cdrom:
+ self.hdd.append(Harddisk(device))
+ self.hdd.sort()
+ SystemInfo["Harddisk"] = len(self.hdd) > 0
+
+ if not removable or medium_found:
+ # device is the device name, without /dev
+ # physdev is the physical device path, which we (might) use to determine the userfriendly name
+ description = self.getUserfriendlyDeviceName(device, physdev)
+ p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True, device = device)
+ self.partitions.append(p)
+ self.on_partition_list_change("add", p)
+
+ return error, blacklisted, removable, is_cdrom, partitions, medium_found
def removeHotplugPartition(self, device):
- mountpoint = self.getAutofsMountpoint(device)
for x in self.partitions[:]:
- if x.mountpoint == mountpoint:
+ if x.device == device:
self.partitions.remove(x)
- self.on_partition_list_change("remove", x)
+ if x.mountpoint:
+ 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:
- self.hdd[x].stop()
- del self.hdd[idx]
+ hdd.stop()
+ self.hdd.remove(hdd)
break
SystemInfo["Harddisk"] = len(self.hdd) > 0
def HDDList(self):
list = [ ]
for hd in self.hdd:
+ if hd.model() == -1:
+ continue
hdd = hd.model() + " - " + hd.bus()
cap = hd.capacity()
if cap != "":
return self.cd
def getMountedPartitions(self, onlyhotplug = False):
- parts = [x for x in self.partitions if (x.is_hotplug or not onlyhotplug) and x.mounted()]
+ parts = [x for x in self.partitions if (x.is_hotplug or not onlyhotplug) and x.mounted() and x.mountpoint]
devs = set([x.device for x in parts])
for devname in devs.copy():
if not devname:
if part and dev in devs: # if this is a partition and we still have the wholedisk, remove wholedisk
devs.remove(dev)
+ # remove duplicate device
+ no_force_mounted_list = [x.mountpoint for x in self.partitions if not x.force_mounted]
+ for x in parts:
+ if x.force_mounted:
+ mp = self.getMountpoint(x.device)
+ if mp and mp in no_force_mounted_list:
+ devs.remove(x.device)
+
# return all devices which are not removed due to being a wholedisk when a partition exists
return [x for x in parts if not x.device or x.device in devs]
+ def getLabelFromDevName(self, dev):
+ data = None
+ try:
+ data = os.popen("e2label %s" % dev).read().strip()
+ if not data:
+ data = None
+ except:
+ data = None
+
+ return data
+
def splitDeviceName(self, devname):
# this works for: sdaX, hdaX, sr0 (which is in fact dev="sr0", part=""). It doesn't work for other names like mtdblock3, but they are blacklisted anyway.
dev = devname[:3]
return dev, part and int(part) or 0
def getUserfriendlyDeviceName(self, dev, phys):
+ label = self.getLabelFromDevName("/dev/" + dev)
dev, part = self.splitDeviceName(dev)
description = "External Storage %s" % dev
- try:
- description = open("/sys" + phys + "/model").read().strip()
- except IOError, s:
- print "couldn't read model: ", s
- for physdevprefix, pdescription in DEVICEDB.items():
- if phys.startswith(physdevprefix):
- description = pdescription
+ have_model_descr = False
+ if label:
+ description = label
+ have_model_descr = True
+ else:
+ try:
+ description = readFile("/sys" + phys + "/model")
+ have_model_descr = True
+ except IOError, s:
+ print "couldn't read model: ", s
+ from Tools.HardwareInfo import HardwareInfo
+ if dev.find('sr') == 0 and dev[2].isdigit():
+ devicedb = DEVICEDB_SR
+ else:
+ devicedb = DEVICEDB
+ for physdevprefix, pdescription in devicedb.get(HardwareInfo().device_name,{}).items():
+ if phys.startswith(physdevprefix):
+ if have_model_descr:
+ description = pdescription + ' - ' + description
+ else:
+ description = pdescription
# not wholedisk and not partition 1
if part and part != 1:
description += " (Partition %d)" % part
already_mounted = True
if not already_mounted:
self.partitions.append(Partition(mountpoint = device, description = desc))
-
+
def removeMountedPartition(self, mountpoint):
for x in self.partitions[:]:
if x.mountpoint == mountpoint:
projects / vuplus_dvbapp / blobdiff