Annotation of /trunk/nxserver-freenx/patches/nxserver-freenx-0.7.2-nxagent-path.patch
Parent Directory | Revision Log
Revision 568 -
(hide annotations)
(download)
Sun Apr 20 10:06:17 2008 UTC (16 years, 5 months ago) by niro
File size: 2277 byte(s)
Sun Apr 20 10:06:17 2008 UTC (16 years, 5 months ago) by niro
File size: 2277 byte(s)
-fixes nxagent search path
1 | niro | 568 | diff -Naur freenx-server-0.7.2/nxloadconfig freenx-server-0.7.2-magellan/nxloadconfig |
2 | --- freenx-server-0.7.2/nxloadconfig 2008-04-20 12:03:09.000000000 +0200 | ||
3 | +++ freenx-server-0.7.2-magellan/nxloadconfig 2008-04-20 12:04:35.000000000 +0200 | ||
4 | @@ -58,6 +58,7 @@ | ||
5 | # Where can different nx components be found | ||
6 | NX_DIR=/usr | ||
7 | PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys | ||
8 | +NXAGENT_PATH_BIN=$NX_DIR/lib/NX/bin | ||
9 | PATH_LIB=$NX_DIR/lib/NX/lib | ||
10 | NX_ETC_DIR=/etc/nxserver | ||
11 | NX_SESS_DIR=/var/lib/nxserver/db | ||
12 | @@ -309,7 +310,7 @@ | ||
13 | [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB | ||
14 | [ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" | ||
15 | |||
16 | -NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') | ||
17 | +NX_BACKEND_VERSION=$(strings $NXAGENT_PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') | ||
18 | |||
19 | [ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend | ||
20 | |||
21 | @@ -346,7 +347,7 @@ | ||
22 | ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\"" | ||
23 | # Check for NX agents ... | ||
24 | |||
25 | - [ ! -x "$PATH_BIN/nxagent" ] && \ | ||
26 | + [ ! -x "$NXAGENT_PATH_BIN/nxagent" ] && \ | ||
27 | ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components." | ||
28 | |||
29 | if [ "ENABLE_EXTERNAL_NXDESKTOP" = "1" ] | ||
30 | @@ -598,7 +599,7 @@ | ||
31 | [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \ | ||
32 | ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\"" | ||
33 | |||
34 | - [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ | ||
35 | + [ -z "$(strings $NXAGENT_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ | ||
36 | ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[012].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].0 backend is needed for this version of FreeNX." | ||
37 | |||
38 | [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ |