Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...

diff --git a/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py b/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
index ec12258..66b67aa 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
@@ -1455,11 +1455,13 @@ class deviceManagerHotplug:
 
        def doUmount(self, device, mountpoint):
                devpath = "/dev/"+device
-               if len(deviceinfo.checkMountDev(devpath)) == 0:
+               mountpoints = deviceinfo.checkMountDev(devpath)
+               if len(mountpoints) == 0:
                        return
-               cmd = "umount %s"%devpath
-               print "[DeviceManager] cmd : %s"%cmd
-               os.system(cmd)
+               for mp in mountpoints:
+                       cmd = "umount %s"%devpath
+                       print "[DeviceManager] cmd : %s"%cmd
+                       os.system(cmd)
 
        def addHotPlugDevice(self, partition):
                device = partition.device

diff --git a/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py
index ff6849d..1416e31 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py
@@ -523,9 +523,12 @@ class WirelessAccessPoint(Screen,ConfigListScreen):
                sysctlList = {}
                for line in sysctlLines:
                        line = line.strip()
-                       (key,value) = line.split("=")
-                       key=key.strip()
-                       value=value.strip()
+                       try:
+                               (key,value) = line.split("=")
+                               key=key.strip()
+                               value=value.strip()
+                       except:
+                               continue
                        sysctlList[key] = value
                sysctlList["net.ipv4.ip_forward"] = str(setValue)
                fp = file(sysctlPath, "w")