Merge branch 'obi/master'

15 files changed, 328 insertions, 94 deletions

diff --git a/lib/python/Plugins/DemoPlugins/TPMDemo/Makefile.am b/lib/python/Plugins/DemoPlugins/TPMDemo/Makefile.am
index 3ccca98e..4828081f 100644
--- a/lib/python/Plugins/DemoPlugins/TPMDemo/Makefile.am
+++ b/lib/python/Plugins/DemoPlugins/TPMDemo/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/DemoPlugins/TPMDemo
+installdir = $(pkglibdir)/python/Plugins/DemoPlugins/TPMDemo
 
 install_PYTHON = \
 	__init__.py \
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
index 71ea7142..ec212e47 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
@@ -1,4 +1,3 @@
-if HAVE_DDVDLIB
 SUBDIRS = src meta
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
@@ -8,4 +7,3 @@ install_PYTHON = \
 	plugin.py \
 	keymap.xml \
 	LICENSE
-endif
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
index 27c751cf..7aaec9bb 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
@@ -1,17 +1,15 @@
-OBJS := servicedvd.cpp
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
--include $(OBJS:.cpp=.d)
+plugindir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
 
-installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
+plugin_LTLIBRARIES = servicedvd.la
 
-install_PYTHON = \
-	servicedvd.so
+servicedvd_la_SOURCES = \
+	servicedvd.cpp \
+	servicedvd.h
 
-servicedvd.so:
-	$(CXX) $(CPPFLAGS) -MD $(CXXFLAGS) $(DEFS) -I$(top_srcdir)/include \
-	-Wall -W $(OBJS) -shared -fPIC -Wl,-soname,servicedvd.so -o servicedvd.so \
-	$(LDFLAGS) -ldreamdvd
-
-all: servicedvd.so
-
-CLEANFILES = servicedvd.so servicedvd.d
+servicedvd_la_LDFLAGS = -avoid-version -module
diff --git a/lib/python/Plugins/Extensions/Makefile.am b/lib/python/Plugins/Extensions/Makefile.am
index 5a6e3f3a..7a3a9be2 100755
--- a/lib/python/Plugins/Extensions/Makefile.am
+++ b/lib/python/Plugins/Extensions/Makefile.am
@@ -1,6 +1,10 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions
 
-SUBDIRS = TuxboxPlugins CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDPlayer DVDBurn Modem
+SUBDIRS = TuxboxPlugins CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDBurn Modem
+
+if HAVE_LIBDDVD
+SUBDIRS += DVDPlayer
+endif
 
 install_PYTHON =	\
 	__init__.py
diff --git a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
index 8e80e183..5ce7d031 100644
--- a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
@@ -1,17 +1,15 @@
-OBJS = socket_mmi.cpp
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h \
+	-include $(top_builddir)/enigma2_config.h
 
--include $(OBJS:.cpp=.d)
+plugindir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI
 
-installdir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI
+plugin_LTLIBRARIES = socketmmi.la
 
-install_PYTHON = \
-	socketmmi.so
+socketmmi_la_SOURCES = \
+	socket_mmi.cpp \
+	socket_mmi.h
 
-socketmmi.so: socket_mmi.cpp socket_mmi.h
-	$(CXX) $(CPPFLAGS) -MD $(CXXFLAGS) $(DEFS) -I$(top_srcdir)/include \
-	-Wall -W $(OBJS) -shared -fPIC -Wl,-soname,socketmmi.so -o socketmmi.so \
-	$(LDFLAGS)
-
-all: socketmmi.so
-
-CLEANFILES = socketmmi.so socketmmi.d
+socketmmi_la_LDFLAGS = -avoid-version -module
diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
index 2c0edf53..52296c66 100755
--- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
@@ -12,7 +12,7 @@ from ServiceReference import ServiceReference
 from Plugins.Plugin import PluginDescriptor
 from xml.etree.cElementTree import parse as ci_parse
 from Tools.XMLTools import elementsWithTag, mergeText, stringToXML
-from enigma import eDVBCI_UI, eDVBCIInterfaces
+from enigma import eDVBCI_UI, eDVBCIInterfaces, eEnv
 
 from os import system, path as os_path
 
@@ -115,7 +115,7 @@ class CIconfigMenu(Screen):
 
 		Screen.__init__(self, session)
 		self.ci_slot=ci_slot
-		self.filename="/etc/enigma2/ci"+str(self.ci_slot)+".xml"
+		self.filename = eEnv.resolve("${sysconfdir}/enigma2/ci") + str(self.ci_slot) + ".xml"
 
 		self["key_red"] = StaticText(_("Delete"))
 		self["key_green"] = StaticText(_("add Service"))
@@ -567,7 +567,7 @@ def activate_all(session):
 			return Len > 0 and definitions[Len-1].text or default	
 
 		for ci in range(NUM_CI):
-			filename="/etc/enigma2/ci"+str(ci)+".xml"
+			filename = eEnv.resolve("${sysconfdir}/enigma2/ci") + str(ci) + ".xml"
 
 			if not os_path.exists(filename):
 				print "[CI_Activate_Config_CI%d] no config file found" %ci
diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
index b19007c9..1f379f10 100644
--- a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
@@ -1,66 +1,300 @@
 from Plugins.Plugin import PluginDescriptor
-from twisted.internet.protocol import Protocol, Factory
-from twisted.internet import reactor
 from Components.Harddisk import harddiskmanager
+from Tools.Directories import fileExists
 
 hotplugNotifier = [ ]
+bdpoll = None
 
-class Hotplug(Protocol):
-	def connectionMade(self):
-		self.received = ""
+def processHotplugData(self, v):
+	print "hotplug:", v
+	action = v.get("ACTION")
+	device = v.get("DEVPATH")
+	physdevpath = v.get("PHYSDEVPATH")
+	media_state = v.get("X_E2_MEDIA_STATUS")
 
-	def dataReceived(self, data):
-		self.received += data
+	dev = device.split('/')[-1]
 
-	def connectionLost(self, reason):
-		data = self.received.split('\0')[:-1]
+	if action is not None and action == "add":
+		error, blacklisted, removable, is_cdrom, partitions, medium_found = harddiskmanager.addHotplugPartition(dev, physdevpath)
+		if bdpoll and removable or is_cdrom:
+			bdpoll.addDevice(dev, is_cdrom, medium_found)
+	elif action is not None and action == "remove":
+		if bdpoll:
+			bdpoll.removeDevice(dev)
+		harddiskmanager.removeHotplugPartition(dev)
+	elif media_state is not None:
+		if media_state == '1':
+			harddiskmanager.removeHotplugPartition(dev)
+			harddiskmanager.addHotplugPartition(dev, physdevpath)
+		elif media_state == '0':
+			harddiskmanager.removeHotplugPartition(dev)
 
-		v = {}
+	for callback in hotplugNotifier:
+		try:
+			callback(dev, action or media_state)
+		except AttributeError:
+			hotplugNotifier.remove(callback)
 
-		for x in data:
-			i = x.find('=')
-			var, val = x[:i], x[i+1:]
-			v[var] = val
+CDROM_DRIVE_STATUS = 0x5326
+CDROM_MEDIA_CHANGED = 0x5325
+CDSL_CURRENT = ((int)(~0>>1))
+CDS_NO_INFO = 0
+CDS_NO_DISC = 1
+CDS_TRAY_OPEN = 2
+CDS_DRIVE_NOT_READY = 3
+CDS_DISC_OK = 4
+ENOMEDIUM = 159
+IOC_NRBITS = 8
+IOC_NRSHIFT = 0
+IOC_TYPESHIFT = (IOC_NRSHIFT+IOC_NRBITS)
+BLKRRPART = ((0x12<<IOC_TYPESHIFT) | (95<<IOC_NRSHIFT))
 
-		print "hotplug:", v
+def autostart(reason, **kwargs):
+	if reason == 0:
+		print "starting hotplug handler"
 
-		action = v.get("ACTION")
-		device = v.get("DEVPATH")
-		physdevpath = v.get("PHYSDEVPATH")
-		media_state = v.get("X_E2_MEDIA_STATUS")
+		if fileExists('/dev/.udev'):
+			global netlink
+			global bdpoll
+			from enigma import eSocketNotifier, eTimer, ePythonMessagePump
+			import socket
+			from select import POLLIN, POLLPRI
 
-		dev = device.split('/')[-1]
+			class Netlink:
+				def __init__(self):
+					self.netlink = socket.socket(socket.AF_NETLINK, socket.SOCK_DGRAM, 15)
+					self.netlink.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 65536)
+					self.netlink.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 65536)
+					self.netlink.bind((0, 1))
+					self.sn = eSocketNotifier(self.netlink.fileno(), POLLIN|POLLPRI)
+					self.sn.callback.append(self.dataAvail)
 
-		if action is not None and action == "add":
-			harddiskmanager.addHotplugPartition(dev, physdevpath)
-		elif action is not None and action == "remove":
-			harddiskmanager.removeHotplugPartition(dev)
-		elif media_state is not None:
-			if media_state == '1':
-				harddiskmanager.removeHotplugPartition(dev)
-				harddiskmanager.addHotplugPartition(dev, physdevpath)
-			elif media_state == '0':
-				harddiskmanager.removeHotplugPartition(dev)
-		
-		for callback in hotplugNotifier:
-			try:
-				callback(dev, action or media_state)
-			except AttributeError:
-				hotplugNotifier.remove(callback)
+				def dataAvail(self, what):
+					received = self.netlink.recvfrom(16384)
+#					print "HOTPLUG(%d):" %(what), received
 
-def autostart(reason, **kwargs):
-	if reason == 0:
-		print "starting hotplug handler"
-		factory = Factory()
-		factory.protocol = Hotplug
+					data = received[0].split('\0')[:-1]
+					v = {}
+
+					for x in data:
+						i = x.find('=')
+						var, val = x[:i], x[i+1:]
+						v[var] = val
+
+					if v['SUBSYSTEM'] == 'block' and v['ACTION'] in ('add', 'remove'):
+						processHotplugData(self, v)
+
+			from threading import Thread, Semaphore, Lock
+
+			class ThreadQueue:
+				def __init__(self):
+					self.__list = [ ]
+					self.__lock = Lock()
+
+				def push(self, val):
+					list = self.__list
+					lock = self.__lock
+					lock.acquire()
+					list.append(val)
+					lock.release()
+
+				def pop(self):
+					list = self.__list
+					lock = self.__lock
+					lock.acquire()
+					ret = list[0]
+					del list[0]
+					lock.release()
+					return ret
 
-		try:
 			import os
-			os.remove("/tmp/hotplug.socket")
-		except OSError:
-			pass
+			import errno
+			import fcntl
+
+			class BDPoll(Thread):
+				CHECK_INTERVAL = 2000
+				MSG_MEDIUM_REMOVED = 1
+				MSG_MEDIUM_INSERTED = 2
+				MSG_POLL_FINISHED = 4
+				def __init__(self):
+					Thread.__init__(self)
+					self.__sema = Semaphore(0)
+					self.__lock = Lock()
+					self.running = False
+					self.devices_to_poll = { }
+					self.messages = ThreadQueue()
+					self.checkTimer = eTimer()
+					self.checkTimer.callback.append(self.timeout)
+					self.checkTimer.start(BDPoll.CHECK_INTERVAL, True)
+					self.mp = ePythonMessagePump()
+					self.mp.recv_msg.get().append(self.gotThreadMsg)
+					self.start()
+
+				def gotThreadMsg(self, msg):
+					msg = self.messages.pop()
+					if msg[0] == BDPoll.MSG_MEDIUM_REMOVED:
+						print "MSG_MEDIUM_REMOVED"
+						harddiskmanager.removeHotplugPartition(msg[1])
+					elif msg[0] == BDPoll.MSG_MEDIUM_INSERTED:
+						print "MSG_MEDIUM_INSERTED"
+						harddiskmanager.addHotplugPartition(msg[1])
+					elif msg[0] == BDPoll.MSG_POLL_FINISHED:
+						self.checkTimer.start(BDPoll.CHECK_INTERVAL, True)
+
+				def timeout(self):
+					self.__sema.release() # start bdpoll loop in thread
+
+				def is_mounted(self, dev):
+					mounts = file('/proc/mounts').read()
+					return mounts.find(dev) != -1
+
+				def run(self):
+					sema = self.__sema
+					lock = self.__lock
+					messages = self.messages
+					mp = self.mp
+					self.running = True
+					while self.running:
+						sema.acquire()
+						self.__lock.acquire()
+						devices_to_poll = self.devices_to_poll.items()
+						self.__lock.release()
+						devices_to_poll_processed = [ ]
+						for device, state in devices_to_poll:
+							got_media = False
+							is_cdrom, prev_media_state = state
+							if is_cdrom:
+								try:
+									fd = os.open("/dev/" + device, os.O_RDONLY | os.O_NONBLOCK | os.O_EXCL)
+								except OSError, err:
+									if err.errno == errno.EBUSY:
+										print "open cdrom exclusive failed:",
+										if not self.is_mounted(device):
+											print "not mounted"
+											continue
+										try:
+											print "mounted... try non exclusive"
+											fd = os.open("/dev/" + device, os.O_RDONLY | os.O_NONBLOCK)
+										except OSError, err:
+											print "open cdrom not exclusive failed", os.strerror(err.errno)
+											continue
+								#here the fs must be valid!
+								try:
+									ret = fcntl.ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)
+								except IOError, err:
+									print "ioctl CDROM_DRIVE_STATUS failed", os.strerror(err.errno)
+								else:
+									if ret in (CDS_NO_INFO, CDS_NO_DISC, CDS_TRAY_OPEN, CDS_DRIVE_NOT_READY):
+										pass
+									elif ret == CDS_DISC_OK:
+										#todo new kernels support events to userspace event on media change
+										#but not 2.6.18.... see hotplug-ng bdpoll.c
+										got_media = True
+								os.close(fd)
+							else:
+								try:
+									fd = os.open("/dev/" + device, os.O_RDONLY)
+								except OSError, err:
+									if err.errno == ENOMEDIUM:
+										pass
+									else:
+										print "open non cdrom failed", os.strerror(err.errno)
+										continue
+								else:
+									got_media = True
+									os.close(fd)
+							if prev_media_state:
+								if not got_media:
+									print "media removal detected on", device
+									try:
+										fd = os.open("/dev/" + device, os.O_RDONLY | os.O_NONBLOCK)
+									except OSError, err:
+										print "open device for blkrrpart ioctl failed", os.strerror(err.errno)
+									else:
+										try:
+											fcntl.ioctl(fd, BLKRRPART)
+										except IOError, err:
+											print "ioctl BLKRRPART failed", os.strerror(err.errno)
+										os.close(fd)
+							else:
+								if got_media:
+									print "media insertion detected on", device
+							devices_to_poll_processed.append((device, is_cdrom, got_media))
+						self.__lock.acquire()
+						for device, is_cdrom, state in devices_to_poll_processed:
+							old_state = self.devices_to_poll.get(device)
+							if old_state is not None and old_state[1] != state:
+								msg = state and BDPoll.MSG_MEDIUM_INSERTED or BDPoll.MSG_MEDIUM_REMOVED
+								self.devices_to_poll[device] = (is_cdrom, state)
+								messages.push((msg, device))
+								mp.send(0)
+
+						self.__lock.release()
+						messages.push((self.MSG_POLL_FINISHED,))
+						mp.send(0)
+
+				def addDevice(self, device, is_cdrom, inserted):
+					self.__lock.acquire()
+					if device in self.devices_to_poll:
+						print "device", device, "already in bdpoll"
+					else:
+						print "add device", device, "to bdpoll current state:",
+						if inserted:
+							print "medium inserted"
+						else:
+							print "medium removed"
+						self.devices_to_poll[device] = (is_cdrom, inserted)
+					self.__lock.release()
+
+				def removeDevice(self, device):
+					self.__lock.acquire()
+					if device in self.devices_to_poll:
+						print "device", device, "removed from bdpoll"
+						del self.devices_to_poll[device]
+					else:
+						print "try to del not exist device", device, "from bdpoll"
+					self.__lock.release()
+
+			netlink = Netlink()
+			bdpoll = BDPoll()
+			for blockdev, removable, is_cdrom, medium_found in harddiskmanager.devices_scanned_on_init:
+				if removable or is_cdrom:
+					bdpoll.addDevice(blockdev, is_cdrom, medium_found)
+		else:
+			from twisted.internet.protocol import Protocol, Factory
+			from twisted.internet import reactor
+
+			try:
+				import os
+				os.remove("/tmp/hotplug.socket")
+			except OSError:
+				pass
+
+			class Hotplug(Protocol):
+				def connectionMade(self):
+					print "HOTPLUG connection!"
+					self.received = ""
+
+				def dataReceived(self, data):
+					print "hotplug:", data
+					self.received += data
+					print "complete", self.received
+
+				def connectionLost(self, reason):
+					print "HOTPLUG connection lost!"
+					data = self.received.split('\0')[:-1]
+					v = {}
+
+					for x in data:
+						i = x.find('=')
+						var, val = x[:i], x[i+1:]
+						v[var] = val
+
+					processHotplugData(self, v)
 
-		reactor.listenUNIX("/tmp/hotplug.socket", factory)
+			factory = Factory()
+			factory.protocol = Hotplug
+			reactor.listenUNIX("/tmp/hotplug.socket", factory)
 
 def Plugins(**kwargs):
 	return PluginDescriptor(name = "Hotplug", description = "listens to hotplug events", where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart)
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py b/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
index ba96c071..3504d4cb 100755
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
@@ -14,7 +14,7 @@ from Screens.TaskView import JobView
 from Tools.Directories import fileExists
 from Tools.HardwareInfo import HardwareInfo
 from os import system
-from enigma import eConsoleAppContainer, quitMainloop
+from enigma import eConsoleAppContainer, quitMainloop, eEnv
 from Components.About import about
 
 class md5Postcondition(Condition):
@@ -51,7 +51,7 @@ class md5verify(Task):
 class writeNAND(Task):
 	def __init__(self, job, param, box):
 		Task.__init__(self,job, ("Writing image file to NAND Flash"))
-		self.setTool("/usr/lib/enigma2/python/Plugins/SystemPlugins/NFIFlash/writenfi-mipsel-2.6.18-r1")
+		self.setTool(eEnv.resolve("${libdir}/enigma2/python/Plugins/SystemPlugins/NFIFlash/writenfi-mipsel-2.6.18-r1"))
 		if box == "dm7025":
 			self.end = 256
 		elif box[:5] == "dm800":
@@ -226,4 +226,4 @@ class NFIFlash(Screen):
 		if self.job.status == self.job.FINISHED:
 			self["status"].text = ("rebooting...")
 			from os import system
-			system("/usr/lib/enigma2/python/Plugins/SystemPlugins/NFIFlash/kill_e2_reboot.sh")
+			system(eEnv.resolve("${libdir}/enigma2/python/Plugins/SystemPlugins/NFIFlash/kill_e2_reboot.sh"))
diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
index 997b9571..30cbb6b6 100755
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
@@ -12,12 +12,13 @@ from Plugins.Plugin import PluginDescriptor
 from Components.config import config
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 from os import path, walk
+from enigma import eEnv
 
 class SkinSelector(Screen):
 	# for i18n:
 	# _("Choose your Skin")
 	skinlist = []
-	root = "/usr/share/enigma2/"
+	root = eEnv.resolve("${datadir}/enigma2/")
 
 	def __init__(self, session, args = None):
 
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
index 7bd7d7a2..01649bb3 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
@@ -11,7 +11,7 @@ from Components.config import config
 from Components.ConfigList import ConfigList,ConfigListScreen
 from Components.FileList import MultiFileSelectList
 from Plugins.Plugin import PluginDescriptor
-from enigma import eTimer
+from enigma import eTimer, eEnv
 from Tools.Directories import *
 from os import popen, path, makedirs, listdir, access, stat, rename, remove, W_OK, R_OK
 from time import gmtime, strftime, localtime
@@ -20,7 +20,7 @@ from datetime import date
 
 config.plugins.configurationbackup = ConfigSubsection()
 config.plugins.configurationbackup.backuplocation = ConfigText(default = '/media/hdd/', visible_width = 50, fixed_size = False)
-config.plugins.configurationbackup.backupdirs = ConfigLocations(default=['/etc/enigma2/', '/etc/network/interfaces', '/etc/wpa_supplicant.conf', '/etc/resolv.conf', '/etc/default_gw', '/etc/hostname'])
+config.plugins.configurationbackup.backupdirs = ConfigLocations(default=[eEnv.resolve('${sysconfdir}/enigma2/'), '/etc/network/interfaces', '/etc/wpa_supplicant.conf', '/etc/resolv.conf', '/etc/default_gw', '/etc/hostname'])
 
 def getBackupPath():
 	backuppath = config.plugins.configurationbackup.backuplocation.value
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/ImageWizard.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/ImageWizard.py
index 1797e4fe..32d7140a 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/ImageWizard.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/ImageWizard.py
@@ -9,13 +9,14 @@ from Plugins.Plugin import PluginDescriptor
 from Tools.Directories import fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
 from os import popen, path, makedirs, listdir, access, stat, rename, remove, W_OK, R_OK
+from enigma import eEnv
 
 from Components.config import config, getConfigListEntry, ConfigSubsection, ConfigText, ConfigLocations, ConfigBoolean
 from Components.Harddisk import harddiskmanager
 config.misc.firstrun = ConfigBoolean(default = True)
 config.plugins.configurationbackup = ConfigSubsection()
 config.plugins.configurationbackup.backuplocation = ConfigText(default = '/media/hdd/', visible_width = 50, fixed_size = False)
-config.plugins.configurationbackup.backupdirs = ConfigLocations(default=['/etc/enigma2/', '/etc/network/interfaces', '/etc/wpa_supplicant.conf'])
+config.plugins.configurationbackup.backupdirs = ConfigLocations(default=[eEnv.resolve('${sysconfdir}/enigma2/'), '/etc/network/interfaces', '/etc/wpa_supplicant.conf'])
 
 
 backupfile = "enigma2settingsbackup.tar.gz"
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index 707663a0..e1f3e1de 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@ -28,7 +28,7 @@ from Components.Network import iNetwork
 from Tools.Directories import pathExists, fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_CURRENT_PLUGIN, SCOPE_CURRENT_SKIN, SCOPE_METADIR
 from Tools.LoadPixmap import LoadPixmap
 from Tools.NumericalTextInput import NumericalTextInput
-from enigma import eTimer, quitMainloop, RT_HALIGN_LEFT, RT_VALIGN_CENTER, eListboxPythonMultiContent, eListbox, gFont, getDesktop, ePicLoad, eRCInput, getPrevAsciiCode
+from enigma import eTimer, quitMainloop, RT_HALIGN_LEFT, RT_VALIGN_CENTER, eListboxPythonMultiContent, eListbox, gFont, getDesktop, ePicLoad, eRCInput, getPrevAsciiCode, eEnv
 from cPickle import dump, load
 from os import path as os_path, system as os_system, unlink, stat, mkdir, popen, makedirs, listdir, access, rename, remove, W_OK, R_OK, F_OK
 from time import time, gmtime, strftime, localtime
@@ -43,7 +43,7 @@ from SoftwareTools import iSoftwareTools
 
 config.plugins.configurationbackup = ConfigSubsection()
 config.plugins.configurationbackup.backuplocation = ConfigText(default = '/media/hdd/', visible_width = 50, fixed_size = False)
-config.plugins.configurationbackup.backupdirs = ConfigLocations(default=['/etc/enigma2/', '/etc/network/interfaces', '/etc/wpa_supplicant.conf', '/etc/resolv.conf', '/etc/default_gw', '/etc/hostname'])
+config.plugins.configurationbackup.backupdirs = ConfigLocations(default=[eEnv.resolve('${sysconfdir}/enigma2/'), '/etc/network/interfaces', '/etc/wpa_supplicant.conf', '/etc/resolv.conf', '/etc/default_gw', '/etc/hostname'])
 
 config.plugins.SoftwareManager = ConfigSubsection()
 config.plugins.SoftwareManager.overwriteConfigFiles = ConfigSelection(
@@ -1684,7 +1684,7 @@ class PacketManager(Screen, NumericalTextInput):
 		self.cmdList = []
 		self.cachelist = []
 		self.cache_ttl = 86400  #600 is default, 0 disables, Seconds cache is considered valid (24h should be ok for caching ipkgs)
-		self.cache_file = '/usr/lib/enigma2/python/Plugins/SystemPlugins/SoftwareManager/packetmanager.cache' #Path to cache directory	 
+		self.cache_file = eEnv.resolve('${libdir}/enigma2/python/Plugins/SystemPlugins/SoftwareManager/packetmanager.cache') #Path to cache directory
 		self.oktext = _("\nAfter pressing OK, please wait!")
 		self.unwanted_extensions = ('-dbg', '-dev', '-doc', 'busybox')
 		self.opkgAvail = fileExists('/usr/bin/opkg')
diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am b/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am
index cfdeb654..490a7720 100755
--- a/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/TempFanControl
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/TempFanControl
 
 SUBDIRS = meta
 
@@ -6,4 +6,4 @@ install_PYTHON = \
 	__init__.py \
 	plugin.py
 
-dist_install_DATA = LICENSE
\ No newline at end of file
+dist_install_DATA = LICENSE
diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index 28ee363e..a13c7975 100755
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@ -1,4 +1,4 @@
-from enigma import eTimer, eTPM
+from enigma import eTimer, eTPM, eEnv
 from Screens.Screen import Screen
 from Components.ActionMap import ActionMap, NumberActionMap
 from Components.Pixmap import Pixmap,MultiPixmap
@@ -18,7 +18,7 @@ from Tools.HardwareInfo import HardwareInfo
 from Wlan import Wlan, wpaSupplicant, iStatus
 import sha
 
-plugin_path = "/usr/lib/enigma2/python/Plugins/SystemPlugins/WirelessLan"
+plugin_path = eEnv.resolve("${libdir}/enigma2/python/Plugins/SystemPlugins/WirelessLan")
 
 list = []
 list.append("WEP")
diff --git a/lib/python/Plugins/newplugin.py b/lib/python/Plugins/newplugin.py
index c1c6f948..32c7269d 100644..100755
--- a/lib/python/Plugins/newplugin.py
+++ b/lib/python/Plugins/newplugin.py
@@ -137,7 +137,7 @@ def Plugins(**kwargs):
 file.close()
 
 makefile = open(pluginpath + "/Makefile.am", "w")
-makefile.write("""installdir = $(LIBDIR)/enigma2/python/Plugins/%s/%s
+makefile.write("""installdir = $(pkglibdir)/python/Plugins/%s/%s
 
 install_PYTHON = \\
 	__init__.py \\