aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-06-28 22:20:57 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-06-28 22:20:57 +0200
commit7b3d592e637910cd0b16beca7db090bc0115a366 (patch)
treec4a3a0969f699b16c5acb1632f6882b9726df80b /debian
parent6af3d3b802171532b5b8472ab1d389b9964ec552 (diff)
downloadnx-libs-7b3d592e637910cd0b16beca7db090bc0115a366.tar.gz
nx-libs-7b3d592e637910cd0b16beca7db090bc0115a366.tar.bz2
nx-libs-7b3d592e637910cd0b16beca7db090bc0115a366.zip
debian/changelog
Improve 023_add-x2goagent-wrapper.full.patch: Properly set NX_TEMP, make sure x2goagent launches even with pam_tmpdir.so being in use.
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/023_add-x2goagent-wrapper.full.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/debian/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch
index d23d3f0ee..d349840c2 100644
--- a/debian/patches/023_add-x2goagent-wrapper.full.patch
+++ b/debian/patches/023_add-x2goagent-wrapper.full.patch
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/bin/x2goagent
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
@@ -20,9 +20,14 @@
+
+NX_LIBS=/usr/lib/nx
+NX_LOCAL_LIBS=/usr/local/lib/nx
-+LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+
++# make sure nxagent starts properly with pam_tmpdir.so being in use
++NX_TEMP=${NX_TEMP:-/tmp}
++
++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
++
+export LD_LIBRARY_PATH
++export NX_TEMP
+
+exec $NX_LIBS/../x2go/x2goagent "$@"