Magellan Linux

Annotation of /trunk/nxserver-freenx/patches/nxserver-freenx-0.7.1-nx2-backend.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 382 - (hide annotations) (download)
Thu Oct 18 23:42:38 2007 UTC (16 years, 7 months ago) by niro
File size: 1896 byte(s)
-rediffed against 0.7.1

1 niro 382 diff -Naur freenx-0.7.1/node.conf.sample freenx-0.7.1-magellan/node.conf.sample
2     --- freenx-0.7.1/node.conf.sample 2007-10-15 00:25:14.000000000 +0200
3     +++ freenx-0.7.1-magellan/node.conf.sample 2007-10-19 01:39:50.000000000 +0200
4     @@ -444,7 +444,7 @@
5     #########################################################################
6    
7     # When you installed a 2.0.0 NX Backend, set this to 1.
8     -#ENABLE_2_0_0_BACKEND="0"
9     +#ENABLE_2_0_0_BACKEND="1"
10    
11     # When set to 1 this will automatically resume started sessions
12     #ENABLE_AUTORECONNECT="0"
13     diff -Naur freenx-0.7.1/nxloadconfig freenx-0.7.1-magellan/nxloadconfig
14     --- freenx-0.7.1/nxloadconfig 2007-10-15 00:25:14.000000000 +0200
15     +++ freenx-0.7.1-magellan/nxloadconfig 2007-10-19 01:42:42.000000000 +0200
16     @@ -194,7 +194,7 @@
17    
18     # Misc directives
19    
20     -ENABLE_2_0_0_BACKEND=""
21     +ENABLE_2_0_0_BACKEND="1"
22     ENABLE_AUTORECONNECT="0"
23     ENABLE_AUTORECONNECT_BEFORE_140="1"
24     EXPORT_USERIP="0"
25     @@ -578,8 +578,9 @@
26     [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
27     ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
28    
29     - [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
30     - ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.0.0 backend is needed for this version of FreeNX."
31     + # disabled, nxagent is a wrapper
32     + #[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
33     + # ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.0.0 backend is needed for this version of FreeNX."
34    
35     [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
36     ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""