Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 164596 | Differences between
and this patch

Collapse All | Expand All

(-)nxloadconfig.orig (-6 / +7 lines)
Lines 58-64 Link Here
58
# Where can different nx components be found
58
# Where can different nx components be found
59
NX_DIR=/usr
59
NX_DIR=/usr
60
PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
60
PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys
61
PATH_LIB=$NX_DIR/lib
61
REAL_PATH_BIN=$NX_DIR/lib/NX/bin
62
PATH_LIB=$NX_DIR/lib/NX/lib
62
NX_ETC_DIR=/etc/nxserver
63
NX_ETC_DIR=/etc/nxserver
63
NX_SESS_DIR=/var/lib/nxserver/db
64
NX_SESS_DIR=/var/lib/nxserver/db
64
NX_HOME_DIR=/var/lib/nxserver/home
65
NX_HOME_DIR=/var/lib/nxserver/home
Lines 154-160 Link Here
154
DEFAULT_X_WM=""
155
DEFAULT_X_WM=""
155
KILL_DEFAULT_X_WM="1"
156
KILL_DEFAULT_X_WM="1"
156
USER_X_STARTUP_SCRIPT=.Xclients
157
USER_X_STARTUP_SCRIPT=.Xclients
157
DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
158
DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
158
COMMAND_START_KDE=startkde
159
COMMAND_START_KDE=startkde
159
COMMAND_START_GNOME=gnome-session
160
COMMAND_START_GNOME=gnome-session
160
COMMAND_START_CDE=cdwm
161
COMMAND_START_CDE=cdwm
Lines 263-273 Link Here
263
[ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
264
[ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
264
[ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
265
[ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
265
[ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
266
[ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
266
[ -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.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
267
[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
267
if [ -z "$ENABLE_2_0_0_BACKEND" ]
268
if [ -z "$ENABLE_2_0_0_BACKEND" ]
268
then
269
then
269
	ENABLE_2_0_0_BACKEND="1"
270
	ENABLE_2_0_0_BACKEND="1"
270
	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
271
	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
271
fi 
272
fi 
272
273
273
[ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
274
[ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
Lines 288-294 Link Here
288
		ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
289
		ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
289
	# Check for NX agents ...
290
	# Check for NX agents ...
290
	
291
	
291
	[ ! -f "$PATH_BIN/nxagent" ] && \
292
	[ ! -f "$REAL_PATH_BIN/nxagent" ] && \
292
		ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
293
		ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
293
		
294
		
294
	[ ! -f "$PATH_BIN/nxdesktop" ] && \
295
	[ ! -f "$PATH_BIN/nxdesktop" ] && \
Lines 509-515 Link Here
509
	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
510
	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
510
		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
511
		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
511
512
512
	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
513
	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
513
		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
514
		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
514
		
515
		
515
	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
516
	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \

Return to bug 164596