@@ -, +, @@ --- .../univention-virtual-machine-manager-daemon/debian/changelog | 6 ++++++ .../src/univention/uvmm/node.py | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) --- a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog +++ a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog @@ -1,3 +1,9 @@ +univention-virtual-machine-manager-daemon (4.0.21-1) unstable; urgency=low + + * Bug #36106: Fix noVNC temporary file location + + -- Philipp Hahn Tue, 18 Nov 2014 20:00:58 +0100 + univention-virtual-machine-manager-daemon (4.0.20-1) unstable; urgency=medium * Bug #36615: fix javascript memory leaks --- a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/src/univention/uvmm/node.py +++ a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/src/univention/uvmm/node.py @@ -737,9 +737,10 @@ class Node(PersistentCached): self.write_novnc_tokens() def write_novnc_tokens(self): - path = os.path.join(self.cache_dir, 'novnc.tokens', uri_encode(self.pd.uri)) + token_dir = os.path.join(self.cache_dir, 'novnc.tokens') + path = os.path.join(token_dir, uri_encode(self.pd.uri)) logger.debug("Writing noVNC tokens to '%s'", path) - with tempfile.NamedTemporaryFile(delete=False) as tmp_file: + with tempfile.NamedTemporaryFile(delete=False, dir=token_dir) as tmp_file: for uuid, domStat in self.domains.iteritems(): try: gfx = domStat.pd.graphics[0] --