nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxnode-magellan-2.patch

diff -Naur src-nxnode/NX/etc/node-magellan.cfg.sample src-nxnode-magellan/NX/etc/node-magellan.cfg.sample
--- src-nxnode/NX/etc/node-magellan.cfg.sample	1970-01-01 01:00:00.000000000 +0100
+++ src-nxnode-magellan/NX/etc/node-magellan.cfg.sample	2012-05-08 13:59:03.237982523 +0200
@@ -0,0 +1,513 @@
+######################################################################
+#                                                                    #
+#  Copyright (c) 2001, 2012 NoMachine, http://www.nomachine.com.     #
+#                                                                    #
+#  All rights reserved.                                              #
+#                                                                    #
+######################################################################
+#
+# based on node-debian.cfg.sample
+#
+
+# Some configuration keys are used to set specific limits, such as the
+# maximum size for the session log. To remove a limitation, set the
+# corresponding key to value '0' or 'Unlimited'.
+
+#
+# Set config file format version.
+#
+ConfigFileVersion 4.0
+
+#
+# Set the log level of NX Node. NX Node logs to the syslog all the
+# events that are <= to the level specified below, according to the
+# following convention:
+#
+# KERN_ERR 3: Error condition.
+# KERN_INFO 6: Informational.
+# KERN_DEBUG 7: Debug messages.
+#
+# NX Node uses level 6 in the syslog to log the event. This
+# is intended to override settings on the local syslog configuration
+# that would prevent the event from being actually logged.
+#
+# The suggested values are:
+#
+# 6: This is the default value. Only the important events
+# are logged.
+#
+# 7: Set the log level to debug.
+#
+#SessionLogLevel 6
+
+#
+# Redirect NX Node to log to a custom file instead of logging
+# to the system log, usually the /var/log/messages file.
+#
+#SystemLogFile /tmp/NX.log
+
+#
+# Specify hostname for the NX Node.
+#
+#NodeName localhost.localdomain
+
+#
+# Enable or disable the automatic clean-up of NX session directories
+# at the time sessions are terminated:
+#
+# 1: Enabled. This is the default value.
+#
+# 0: Disabled. Directories are prefixed by 'T-' and left
+#    for further reference.
+#
+#SessionLogClean 1
+
+#
+# Enable or disable NX Node to log the X client stderr.
+#
+# 1: Enabled. The standard error of the X clients is redirected to
+#    the 'clients' file in the session directory.
+#
+# 0: Disabled. The standard error of the X clients is redirected to
+#    /dev/null.
+#
+#ClientLog 1
+
+#
+# Set the maximum size, expressed in bytes, allowed for the X clients
+# log. The node will terminate the session if this limit is exceeded.
+#
+#ClientLogLimit 0
+
+#
+# Set the maximum size, expressed in bytes, allowed for the session
+# log. The node will terminate the session if this limit is exceeded.
+#
+#SessionLogLimit 0
+
+#
+# Set the maximum amount of data that can be copied from within the
+# NX session to the client. The default value is 0, i.e. unlimited.
+# Limit for the size of the buffer on copy operations needs to be
+# specified in bytes.
+#
+#ClipboardBufferLimit 0
+
+#
+# Enable or disable SSH encryption of all traffic between server and
+# node.
+#
+# 1: Enabled. Unencrypted connections between the server and
+#    the node will be allowed.
+#
+# 0: Disabled. Forbid the use of unencrypted connections. The
+#    node will force the server to tunnel the proxy connections
+#    over the encrypted channel.
+#
+# Session negotiation happens across an encrypted channel. The user
+# can specify if subsequent communication must take place through a
+# direct connection between the proxies or by tunneling it through SSH.
+# Uncomment the key and set the value to 0 to increase the security of
+# the node host or if NX Node is behind a firewall preventing the
+# access to the set of ports used by the NX Node.
+#
+# Unencrypted sessions require that the firewall lets the proxies
+# communicate over the TCP ports ranging from:
+#
+# DisplayBase + 4000
+#
+# to:
+#
+# DisplayBase + 4000 + DisplayLimit
+#
+#EnableUnencryptedSession 1
+
+#
+# Specify path and name of the client to be run by nxnode and nxagent,
+# for example for issuing dialog boxes and messages, instead of the
+# default nxclient.
+#
+#CommandClient /usr/NX/bin/nxclient
+
+#
+# Specify path and name of the command 'fuser' to identify processes
+# using files or sockets.
+#
+CommandFuser /bin/fuser
+
+#
+# Specify path and name of the command 'lsof' to list open files.
+#
+CommandLsof /usr/bin/lsof
+
+#
+# Specify path and name of the command 'xauth' to edit and display
+# the authorization information used when connecting to the X server.
+#
+#CommandXauth xauth
+
+#
+# Specify path and name of the command 'xdpyinfo' for displaying
+# information about an X server.
+#
+#CommandXdpyInfo xdpyinfo
+
+#
+# Specify path and name of the command 'xmodmap' to edit and display
+# the keyboard modifier map and keymap table.
+#
+#CommandXmodmap xmodmap
+
+#
+# Specify path and name of the command to start 'KDE'.
+#
+#CommandStartKDE ""
+
+#
+# Specify path and name of the command to start 'Gnome'.
+#
+#CommandStartGnome ""
+
+#
+# Specify path and name of the command to start 'CDE'.
+#
+#CommandStartCDE cdwm
+
+#
+# Specify path and name of the command to start the RDP Client.
+#
+#CommandStartRDP "rdesktop -f"
+
+#
+# Specify path and name of the command to start the RFB Client.
+#
+#CommandStartRFB "vncviewer -fullscreen"
+
+#
+# Enable or disable use of 'xkbcomp' command:
+#
+# 1: Enabled. Use 'xkbcomp' command.
+#
+# 0: Disabled.
+#
+#EnableCommandXkbComp 1
+
+#
+# Specify path and name of the command 'xkbcomp' to compile XKB key-
+# board description.
+#
+#CommandXkbComp xkbcomp
+
+#
+# Specify location and file name of the keymap file used by 'xkbcomp'.
+#
+#XkbCompKeymapFile /etc/X11/xkb/keymap/xfree86
+
+#
+# Specify the location and name of the SSH authorized keys file.
+#
+SSHAuthorizedKeys $(HOME)/.ssh/authorized_keys
+
+#
+# Specify the font server to be used by nxagent. By default nxagent
+# only uses the X11 system fonts. Uncomment the following line to
+# enable use of an X Font Server.
+#
+#AgentFontServer unix/:7100
+
+#
+# Specify the path of default X window system startup script.
+#
+#DefaultXSession /etc/X11/xdm/Xsession
+
+#
+# Set the default DPI of the X server to the specified value. This
+# should normally not be required, but some desktop applications fail
+# to set an appropriate value and fall back to 75 DPI, which is the
+# value reported by default by the X server.
+#
+#DefaultXDPI 96
+
+#
+# Specify the path of libraries to be added to the nxagent environment.
+# Be sure that NX libraries are listed first.
+#
+#AgentLibraryPath /lib
+
+#
+# Specify the path of libraries to be added to the NX proxy environment.
+#
+#ProxyLibraryPath /lib
+
+#
+# Enable or disable TCP_NODELAY setting in NX proxy.
+#
+# 1: Enabled. Let NX Client choose whether to enable or not TCP_NODELAY
+#    on proxy socket.
+#
+# 0: Disabled. Disable TCP_NODELAY.
+#
+# Due to a bug in old Linux kernels, enabling TCP_NODELAY when running
+# sessions over PPP links can cause sessions to fail if a serious net-
+# work congestion is encountered.
+#
+#ProxyTCPNodelay 0
+
+#
+# Specify a list of comma-separated options to be added to the NX
+# proxy transport.
+#
+#ProxyExtraOptions limit=256k,link=modem
+
+#
+# Append arguments to the command line used to run nxagent for X
+# (Unix sessions).
+#
+# Mutiple parameters can be specified by separating them with a blank
+# character. For security reasons, no shell interpretation is made.
+#
+#AgentExtraOptions "-nocomposite -noshpix"
+
+#
+# Specify the domain of the Windows Terminal Server.
+#
+#DefaultRDPDomain ""
+
+#
+# Specify the path of base directory where the NX Node has to mount
+# shares exported by the user. The default value is $(HOME)/MyShares.
+#
+#ShareBasePath $(HOME)/MyShares
+
+#
+# Specify the path of the directory holding CUPS binaries (e.g. the
+# 'lpoptions' program).
+#
+CUPSBinPath ""
+
+#
+# Specify the path of the directory holding CUPS programs and reserved
+# for administrative purposes (e.g. 'cupsd' or 'lpadmin').
+#
+CUPSSbinPath ""
+
+#
+# Specify the path of directory holding the CUPS backend.
+#
+CUPSBackendPath ""
+
+#
+# Enable or disable CUPS support:
+#
+# 1: Enabled. Enable CUPS support.
+#
+# 0: Disabled. Disable CUPS support.
+#
+EnableCUPSSupport 0
+
+#
+# Specify if NX Node has to add shared printers to CUPS by using the
+# IP address of the node or localhost. Specifying 'ip' is necessary
+# for CUPS versions earlier than 1.2, otherwise 'localhost' can be
+# used.
+#
+#CUPSAddPrinterMode localhost
+
+#
+# Allow NX Node to use the CIFS (SMB) file-sharing protocol to attach the
+# filesystem to the target directory set by the ShareBasePath key.
+#
+# 1: Enabled. The node will use smbfs to mount and unmount the client
+#    shares.
+#
+# 0: Disabled. The node will forbid any attempt to mount the client
+#    shares via smbfs.
+#
+EnableMountShareSMBFS 1
+
+#
+# Allow NX Node the SSHFS file-sharing protocol to attach the
+# filesystem to the target directory set by the ShareBasePath key.
+#
+# 1: Enabled. The node will use fuse to mount and unmount the client
+#    filesystem (SSHFS).
+#
+# 0: Disabled. The node will forbid any attempt to mount the client
+#    filesystem.
+#
+EnableMountShareSSHFS 1
+
+#
+# Specify the TCP port where the SSHD daemon is listening on the NX
+# Node host machine.
+#
+#SSHDPort 22
+
+#
+# Accept or refuse the client connection if SSHD does not export
+# the 'SSH_CONNECTION' and 'SSH_CLIENT' variables in the environment
+# passed to the NX Node.
+#
+# 1: Refuse. Check the remote IP and don't accept the connection if it
+#    can't be determined.
+#
+# 0: Accept. Check the remote IP and accept the connection even if the
+#    remote IP is not provided.
+#
+#SSHDCheckIP 0
+
+#
+# Enable or disable running nxsensor:
+#
+# 1: Enabled.
+#
+# 0: Disabled.
+#
+# Run the nxsensor daemon in the background. This daemon can be used
+# to produce statistics data about the node machine. Data is to be
+# queried and elaborated by the nxstat daemon running on the NX Server
+# host machine.
+#
+#EnableSensor 0
+
+#
+# Specify the hostname or IP address where the nxstat daemon, in
+# charge of collecting and elaborating data provided by nxsensor,
+# is running.
+#
+#StatisticsHost 127.0.0.1
+
+#
+# Specify the port where NX Server will contact the nxsensor daemon to
+# collect the statistics data. The key is also used by nxsensor to
+# find out the network interface where it will listen for incoming
+# connections.
+#
+#NodeSensorPort 19250
+
+#
+# Specify the message to be shown to the user when the user starts the
+# session on this node for the first time.
+#
+#NodeFirstLoginGreeting "Welcome to your NX session"
+
+#
+# Specify the message to be shown to the user every time the user
+# starts a new session on this node.
+#
+#NodeLoginGreeting "Welcome to your NX session"
+
+#
+# Specify a different path to the default, i.e. user's home, where
+# the .nx directory has to be created to store session files. If it
+# doesn't exist yet, NX Node will try to create a sub-directory for
+# each of the users starting a session there, named as username, and
+# will create the .nx under that sub-directory. For example, if this
+# key is set to /tmp/nxdir/, when user nxtest runs the first session,
+# the node will try to create the /tmp/nxdir/nxtest/.nx directory.
+# The directory specifed in the UserNXDirectoryPath key needs to
+# have proper ownership and permissions set to ensure that the node,
+# running as the user, can access it. I.e. the directory should be
+# writeable for all users or alternatively, the administrator should
+# create a directory with proper ownership and permissions, named as
+# username, for each of the users who need to start sessions there.
+#
+#UserNXDirectoryPath ""
+
+#
+# Specify absolute path of the custom script to be executed before
+# the session start-up. The script can accept session ID, username
+# and session type as its input.
+#
+# E.g. UserScriptBeforeSessionStart /tmp/nxscript/script.sh
+#
+#UserScriptBeforeSessionStart ""
+
+#
+# Specify absolute path of the custom script to be executed after the
+# session start-up. The script can accept session ID, username and
+# session type as its input.
+#
+#UserScriptAfterSessionStart ""
+
+#
+# Specify absolute path of the custom script to be executed before
+# the session is disconnected. The script can accept session ID and
+# username as its input.
+#
+#UserScriptBeforeSessionDisconnect ""
+
+#
+# Specify absolute path of the custom script to be executed after the
+# session is disconnected. The script can accept session ID and user-
+# name as its input.
+#
+#UserScriptAfterSessionDisconnect ""
+
+#
+# Specify absolute path of the custom script to be executed before the
+# session is closed. The script can accept session ID and username as
+# its input.
+#
+#UserScriptBeforeSessionClose ""
+
+#
+# Specify absolute path of the custom script to be executed after the
+# session is closed. The script can accept session ID and username as
+# its input.
+#
+#UserScriptAfterSessionClose ""
+
+#
+# Specify absolute path of the custom script to be executed before
+# the session is reconnected. The script can accept session ID and
+# username as its input.
+#
+#UserScriptBeforeSessionReconnect ""
+
+#
+# Specify absolute path of the custom script to be executed after the
+# session is reconnected. The script can accept session ID and user-
+# name as its input.
+#
+#UserScriptAfterSessionReconnect ""
+
+#
+# Specify absolute path of the custom script to be executed after
+# session failure. The script can accept session ID, username and
+# session type as its input.
+#
+#UserScriptAfterSessionFailure ""
+
+#
+# Specify which audio interface should be used to provide sound in NX
+# Sessions. Possible key values are: 'pulseaudio', 'oss', 'alsa' and
+# 'disabled'. The initial values are set during installation process
+# automatically, based on detected system configuration.
+#
+#AudioInterface disabled
+
+#
+# Specify path and name of the command to start PulseAudio server.
+#
+#CommandStartPulseAudio ""
+
+#
+# Specify path and name of the program for session recording.
+#
+#CommandRecording /usr/NX/bin/nxmpeg
+
+#
+# Specify a list of comma-separated session types available on this
+# host.
+#
+#AvailableSessionTypes ""
+
+#
+# Specify for how long NX Node has to wait for a reply from NX Server
+# before considering that the connection with the server has been lost.
+# The default value, 120 seconds, lets NX Node wait for 2 minutes. Set
+# this value to 0 to disable timeout on the node.
+#
+#NodeConnectionTimeout 120
+
diff -Naur src-nxnode/NX/etc/node-magellan.cfg.sample.personal src-nxnode-magellan/NX/etc/node-magellan.cfg.sample.personal
--- src-nxnode/NX/etc/node-magellan.cfg.sample.personal	1970-01-01 01:00:00.000000000 +0100
+++ src-nxnode-magellan/NX/etc/node-magellan.cfg.sample.personal	2012-05-08 13:59:59.942982523 +0200
@@ -0,0 +1,481 @@
+######################################################################
+#                                                                    #
+#  Copyright (c) 2001, 2012 NoMachine, http://www.nomachine.com.     #
+#                                                                    #
+#  All rights reserved.                                              #
+#                                                                    #
+######################################################################
+#
+# based on node-debian.cfg.sample.personal
+#
+
+# Some configuration keys are used to set specific limits, such as the
+# maximum size for the session log. To remove a limitation, set the
+# corresponding key to value '0' or 'Unlimited'.
+
+#
+# Set config file format version.
+#
+ConfigFileVersion 4.0
+
+#
+# Set the log level of NX Node. NX Node logs to the syslog all the
+# events that are <= to the level specified below, according to the
+# following convention:
+#
+# KERN_ERR 3: Error condition.
+# KERN_INFO 6: Informational.
+# KERN_DEBUG 7: Debug messages.
+#
+# NX Node uses level 6 in the syslog to log the event. This
+# is intended to override settings on the local syslog configuration
+# that would prevent the event from being actually logged.
+#
+# The suggested values are:
+#
+# 6: This is the default value. Only the important events
+# are logged.
+#
+# 7: Set the log level to debug.
+#
+#SessionLogLevel 6
+
+#
+# Redirect NX Node to log to a custom file instead of logging
+# to the system log, usually the /var/log/messages file.
+#
+#SystemLogFile /tmp/NX.log
+
+#
+# Specify hostname for the NX Node.
+#
+#NodeName localhost.localdomain
+
+#
+# Enable or disable the automatic clean-up of NX session directories
+# at the time sessions are terminated:
+#
+# 1: Enabled. This is the default value.
+#
+# 0: Disabled. Directories are prefixed by 'T-' and left
+#    for further reference.
+#
+#SessionLogClean 1
+
+#
+# Enable or disable NX Node to log the X client stderr.
+#
+# 1: Enabled. The standard error of the X clients is redirected to
+#    the 'clients' file in the session directory.
+#
+# 0: Disabled. The standard error of the X clients is redirected to
+#    /dev/null.
+#
+#ClientLog 1
+
+#
+# Set the maximum size, expressed in bytes, allowed for the X clients
+# log. The node will terminate the session if this limit is exceeded.
+#
+#ClientLogLimit 0
+
+#
+# Set the maximum size, expressed in bytes, allowed for the session
+# log. The node will terminate the session if this limit is exceeded.
+#
+#SessionLogLimit 0
+
+#
+# Set the maximum amount of data that can be copied from within the
+# NX session to the client. The default value is 0, i.e. unlimited.
+# Limit for the size of the buffer on copy operations needs to be
+# specified in bytes.
+#
+#ClipboardBufferLimit 0
+
+#
+# Enable or disable SSH encryption of all traffic between server and
+# node.
+#
+# 1: Enabled. Unencrypted connections between the server and
+#    the node will be allowed.
+#
+# 0: Disabled. Forbid the use of unencrypted connections. The
+#    node will force the server to tunnel the proxy connections
+#    over the encrypted channel.
+#
+# Session negotiation happens across an encrypted channel. The user
+# can specify if subsequent communication must take place through a
+# direct connection between the proxies or by tunneling it through SSH.
+# Uncomment the key and set the value to 0 to increase the security of
+# the node host or if NX Node is behind a firewall preventing the
+# access to the set of ports used by the NX Node.
+#
+# Unencrypted sessions require that the firewall lets the proxies
+# communicate over the TCP ports ranging from:
+#
+# DisplayBase + 4000
+#
+# to:
+#
+# DisplayBase + 4000 + DisplayLimit
+#
+#EnableUnencryptedSession 1
+
+#
+# Specify path and name of the client to be run by nxnode and nxagent,
+# for example for issuing dialog boxes and messages, instead of the
+# default nxclient.
+#
+#CommandClient /usr/NX/bin/nxclient
+
+#
+# Specify path and name of the command 'fuser' to identify processes
+# using files or sockets.
+#
+CommandFuser /bin/fuser
+
+#
+# Specify path and name of the command 'lsof' to list open files.
+#
+CommandLsof /usr/bin/lsof
+
+#
+# Specify path and name of the command 'xauth' to edit and display
+# the authorization information used when connecting to the X server.
+#
+#CommandXauth xauth
+
+#
+# Specify path and name of the command 'xdpyinfo' for displaying
+# information about an X server.
+#
+#CommandXdpyInfo xdpyinfo
+
+#
+# Specify path and name of the command 'xmodmap' to edit and display
+# the keyboard modifier map and keymap table.
+#
+#CommandXmodmap xmodmap
+
+#
+# Specify path and name of the command to start 'KDE'.
+#
+#CommandStartKDE ""
+
+#
+# Specify path and name of the command to start 'Gnome'.
+#
+#CommandStartGnome ""
+
+#
+# Specify path and name of the command to start 'CDE'.
+#
+#CommandStartCDE cdwm
+
+#
+# Specify path and name of the command to start the RDP Client.
+#
+#CommandStartRDP "rdesktop -f"
+
+#
+# Specify path and name of the command to start the RFB Client.
+#
+#CommandStartRFB "vncviewer -fullscreen"
+
+#
+# Specify path and name of the program for session recording.
+#
+#CommandRecording /usr/NX/bin/nxmpeg
+
+#
+# Enable or disable use of 'xkbcomp' command:
+#
+# 1: Enabled. Use 'xkbcomp' command.
+#
+# 0: Disabled.
+#
+#EnableCommandXkbComp 1
+
+#
+# Specify path and name of the command 'xkbcomp' to compile XKB key-
+# board description.
+#
+#CommandXkbComp xkbcomp
+
+#
+# Specify location and file name of the keymap file used by 'xkbcomp'.
+#
+#XkbCompKeymapFile /etc/X11/xkb/keymap/xfree86
+
+#
+# Specify the font server to be used by nxagent. By default nxagent
+# only uses the X11 system fonts. Uncomment the following line to
+# enable use of an X Font Server.
+#
+#AgentFontServer unix/:7100
+
+#
+# Specify the path of default X window system startup script.
+#
+#DefaultXSession /etc/X11/xdm/Xsession
+
+#
+# Set the default DPI of the X server to the specified value. This
+# should normally not be required, but some desktop applications fail
+# to set an appropriate value and fall back to 75 DPI, which is the
+# value reported by default by the X server.
+#
+#DefaultXDPI 96
+
+#
+# Specify the path of libraries to be added to the nxagent environment.
+# Be sure that NX libraries are listed first.
+#
+#AgentLibraryPath /lib
+
+#
+# Specify the path of libraries to be added to the NX proxy environment.
+#
+#ProxyLibraryPath /lib
+
+#
+# Enable or disable TCP_NODELAY setting in NX proxy.
+#
+# 1: Enabled. Let NX Client choose whether to enable or not TCP_NODELAY
+#    on proxy socket.
+#
+# 0: Disabled. Disable TCP_NODELAY.
+#
+# Due to a bug in old Linux kernels, enabling TCP_NODELAY when running
+# sessions over PPP links can cause sessions to fail if a serious net-
+# work congestion is encountered.
+#
+#ProxyTCPNodelay 0
+
+#
+# Specify a list of comma-separated options to be added to the NX
+# proxy transport.
+#
+#ProxyExtraOptions limit=256k,link=modem
+
+#
+# Append arguments to the command line used to run nxagent for X
+# (Unix sessions).
+#
+# Mutiple parameters can be specified by separating them with a blank
+# character. For security reasons, no shell interpretation is made.
+#
+#AgentExtraOptions "-nocomposite -noshpix"
+
+#
+# Specify the domain of the Windows Terminal Server.
+#
+#DefaultRDPDomain ""
+
+#
+# Specify the path of base directory where the NX Node has to mount
+# shares exported by the user. The default value is $(HOME)/MyShares.
+#
+#ShareBasePath $(HOME)/MyShares
+
+#
+# Specify the path of the directory holding CUPS binaries (e.g. the
+# 'lpoptions' program).
+#
+CUPSBinPath ""
+
+#
+# Specify the path of the directory holding CUPS programs and reserved
+# for administrative purposes (e.g. 'cupsd' or 'lpadmin').
+#
+CUPSSbinPath ""
+
+#
+# Specify the path of directory holding the CUPS backend.
+#
+CUPSBackendPath ""
+
+#
+# Enable or disable CUPS support:
+#
+# 1: Enabled. Enable CUPS support.
+#
+# 0: Disabled. Disable CUPS support.
+#
+EnableCUPSSupport 0
+
+#
+# Allow NX Node to use the CIFS (SMB) file-sharing protocol to attach the
+# filesystem to the target directory set by the ShareBasePath key.
+#
+# 1: Enabled. The node will use smbfs to mount and unmount the client
+#    shares.
+#
+# 0: Disabled. The node will forbid any attempt to mount the client
+#    shares via smbfs.
+#
+EnableMountShareSMBFS 1
+
+#
+# Allow NX Node the SSHFS file-sharing protocol to attach the
+# filesystem to the target directory set by the ShareBasePath key.
+#
+# 1: Enabled. The node will use fuse to mount and unmount the client
+#    filesystem (SSHFS).
+#
+# 0: Disabled. The node will forbid any attempt to mount the client
+#    filesystem.
+#
+EnableMountShareSSHFS 1
+
+#
+# Enable or disable running nxsensor:
+#
+# 1: Enabled.
+#
+# 0: Disabled.
+#
+# Run the nxsensor daemon in the background. This daemon can be used
+# to produce statistics data about the node machine. Data is to be
+# queried and elaborated by the nxstat daemon running on the NX Server
+# host machine.
+#
+#EnableSensor 0
+
+#
+# Specify the hostname or IP address where the nxstat daemon, in
+# charge of collecting and elaborating data provided by nxsensor,
+# is running.
+#
+#StatisticsHost 127.0.0.1
+
+#
+# Specify the port where NX Server will contact the nxsensor daemon to
+# collect the statistics data. The key is also used by nxsensor to
+# find out the network interface where it will listen for incoming
+# connections.
+#
+#NodeSensorPort 19250
+
+#
+# Specify the message to be shown to the user when the user starts the
+# session on this node for the first time.
+#
+#NodeFirstLoginGreeting "Welcome to your NX session"
+
+#
+# Specify the message to be shown to the user every time the user
+# starts a new session on this node.
+#
+#NodeLoginGreeting "Welcome to your NX session"
+
+#
+# Specify a different path to the default, i.e. user's home, where
+# the .nx directory has to be created to store session files. If it
+# doesn't exist yet, NX Node will try to create a sub-directory for
+# each of the users starting a session there, named as username, and
+# will create the .nx under that sub-directory. For example, if this
+# key is set to /tmp/nxdir/, when user nxtest runs the first session,
+# the node will try to create the /tmp/nxdir/nxtest/.nx directory.
+# The directory specifed in the UserNXDirectoryPath key needs to
+# have proper ownership and permissions set to ensure that the node,
+# running as the user, can access it. I.e. the directory should be
+# writeable for all users or alternatively, the administrator should
+# create a directory with proper ownership and permissions, named as
+# username, for each of the users who need to start sessions there.
+#
+#UserNXDirectoryPath ""
+
+#
+# Specify absolute path of the custom script to be executed before
+# the session start-up. The script can accept session ID, username
+# and session type as its input.
+#
+# E.g. UserScriptBeforeSessionStart /tmp/nxscript/script.sh
+#
+#UserScriptBeforeSessionStart ""
+
+#
+# Specify absolute path of the custom script to be executed after the
+# session start-up. The script can accept session ID, username and
+# session type as its input.
+#
+#UserScriptAfterSessionStart ""
+
+#
+# Specify absolute path of the custom script to be executed before
+# the session is disconnected. The script can accept session ID and
+# username as its input.
+#
+#UserScriptBeforeSessionDisconnect ""
+
+#
+# Specify absolute path of the custom script to be executed after the
+# session is disconnected. The script can accept session ID and user-
+# name as its input.
+#
+#UserScriptAfterSessionDisconnect ""
+
+#
+# Specify absolute path of the custom script to be executed before the
+# session is closed. The script can accept session ID and username as
+# its input.
+#
+#UserScriptBeforeSessionClose ""
+
+#
+# Specify absolute path of the custom script to be executed after the
+# session is closed. The script can accept session ID and username as
+# its input.
+#
+#UserScriptAfterSessionClose ""
+
+#
+# Specify absolute path of the custom script to be executed before
+# the session is reconnected. The script can accept session ID and
+# username as its input.
+#
+#UserScriptBeforeSessionReconnect ""
+
+#
+# Specify absolute path of the custom script to be executed after the
+# session is reconnected. The script can accept session ID and user-
+# name as its input.
+#
+#UserScriptAfterSessionReconnect ""
+
+#
+# Specify absolute path of the custom script to be executed after
+# session failure. The script can accept session ID, username and
+# session type as its input.
+#
+#UserScriptAfterSessionFailure ""
+
+#
+# Specify which audio interface should be used to provide sound in NX
+# Sessions. Possible key values are: 'pulseaudio', 'oss', 'alsa' and
+# 'disabled'. The initial values are set during installation process
+# automatically, based on detected system configuration.
+#
+#AudioInterface disabled
+
+#
+# Specify path and name of the command to start PulseAudio server.
+#
+#CommandStartPulseAudio ""
+
+#
+# Specify a list of comma-separated session types available on this
+# host.
+#
+#AvailableSessionTypes ""
+
+#
+# Specify for how long NX Node has to wait for a reply from NX Server
+# before considering that the connection with the server has been lost.
+# The default value, 120 seconds, lets NX Node wait for 2 minutes. Set
+# this value to 0 to disable timeout on the node.
+#
+#NodeConnectionTimeout 120
+
diff -Naur src-nxnode/NX/scripts/etc/nxnode src-nxnode-magellan/NX/scripts/etc/nxnode
--- src-nxnode/NX/scripts/etc/nxnode	2012-04-20 13:58:09.000000000 +0200
+++ src-nxnode-magellan/NX/scripts/etc/nxnode	2012-05-08 13:54:07.771982523 +0200
@@ -19,6 +19,9 @@
 elif [ -x /usr/bin/awk ]
 then
   COMMAND_AWK="/usr/bin/awk"
+elif [ -x /bin/awk ]
+then
+  COMMAND_AWK="/bin/awk"
 else
   COMMAND_AWK="awk"
 fi
diff -Naur src-nxnode/NX/scripts/setup/nxnode src-nxnode-magellan/NX/scripts/setup/nxnode
--- src-nxnode/NX/scripts/setup/nxnode	2012-04-20 10:59:39.000000000 +0200
+++ src-nxnode-magellan/NX/scripts/setup/nxnode	2012-05-08 13:54:07.771982523 +0200
@@ -85,6 +85,13 @@
 {
   ret_getLinuxName=0
 
+  # prefer os-release
+  if [ -f /etc/os-release ];
+  then
+    system=$(source /etc/os-release; echo "${ID}")
+    return 0
+  fi
+
   if [ -f /etc/SuSE-release ];
   then
     system=suse
@@ -109,6 +116,12 @@
     return 0
   fi
 
+  if [ -f /etc/mageversion ];
+  then
+    system=magellan
+    return 0
+  fi
+
   if [ -f /etc/debian_version ];
   then
     system=debian
@@ -179,6 +192,9 @@
 if [ -x "/bin/unlink" ];
 then
   UNLINKCOMMAND="/bin/unlink"
+elif [ -x "/usr/bin/unlink" ];
+then
+  UNLINKCOMMAND="/usr/bin/unlink"
 elif [ -x "/usr/sbin/unlink" ];
 then
   UNLINKCOMMAND="/usr/sbin/unlink"
@@ -236,6 +252,9 @@
   if [ -x "/usr/bin/awk" ];
   then
     AWKCOMMAND="/usr/bin/awk"
+  elif [ -x "/bin/awk" ];
+  then
+    AWKCOMMAND="/bin/awk"
   else
     AWKCOMMAND="awk"
   fi
@@ -293,7 +312,7 @@
     SEDCOMMAND="sed"
   fi
 else
-  if [ -x "/bin/grep" ];
+  if [ -x "/bin/sed" ];
   then
     SEDCOMMAND="/bin/sed"
   else
@@ -480,6 +499,9 @@
 if [ -x "/sbin/pidof" ];
 then
   PIDOFCOMMAND="/sbin/pidof"
+elif [ -x "/bin/pidof" ];
+then
+  PIDOFCOMMAND="/bin/pidof"
 else
   PIDOFCOMMAND="pidof"
 fi
@@ -2061,6 +2083,7 @@
   ${ECHOCOMMAND} "                           11.04 Natty Narwhal/11.10 Oneiric Ocelot etc."
   ${ECHOCOMMAND} "       solaris      Sun Solaris 10.0 etc."
   ${ECHOCOMMAND} "       fedora       Fedora 10/11/12/13/14/15/16 etc."
+  ${ECHOCOMMAND} "       magellan     Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc."
 }
 
 updatePathsInFile ()
@@ -3001,6 +3024,9 @@
     elif [ "$system" = "fedora" ];
     then
       detectedSystem="Fedora"
+    elif [ "$system" = "magellan" ];
+    then
+      detectedSystem="Magellan-Linux"
     elif [ "$system" = "debian" ];
     then
       detectedSystem="Debian"
@@ -3390,6 +3416,7 @@
       "suse"               ) ;;
       "mandriva"           ) ;;
       "fedora"             ) ;;
+      "magellan"           ) ;;
       "debian"             ) ;;
       "solaris"            ) ;;
       "macosx"             ) ;;
@@ -3530,6 +3557,7 @@
 /etc/debian_version
 /etc/debian_release
 /etc/fedora-release
+/etc/mageversion
 /etc/gentoo-release
 /etc/immunix-release
 knoppix_version
@@ -3559,6 +3587,7 @@
 /etc/va-release
 /etc/yellowdog-release
 /etc/system-release
+/etc/os-release
 )
 
 getVersionFromLSB()
@@ -5329,6 +5358,12 @@
 
 removeNXinit ()
 {
+  # do nothing on magellan
+  if [ "$system" = "magellan" ];
+  then
+    return
+  fi
+
   tmp=""
 
   if [ "$system" = "fedora" ] || [ "$system" = "redhat" ] || [ "$system" = "suse" ];
@@ -5535,6 +5570,12 @@
 
 addNXinit () {
 
+  # do nothing on magellan
+  if [ "$system" = "magellan" ];
+  then
+    return
+  fi
+
   if [ "${system}" = "macosx" ];
   then
     return
@@ -7217,6 +7258,7 @@
 /etc/node-fedora.cfg.sample
 /etc/node-mandriva.cfg.sample
 /etc/node-redhat.cfg.sample
+/etc/node-magellan.cfg.sample
 /etc/node-suse.cfg.sample
 /etc/node-solaris.cfg.sample
 /etc/node-macosx.cfg.sample
@@ -7878,6 +7920,13 @@
 #
 
 addNXUserLinux () {
+
+  # simply abort if the user exist. on magellan this user is already created.
+  if id nx > /dev/null 2>&1
+  then
+     return
+  fi
+
   if [ "x$system" != "xdebian" ]
   then
     sysuser=`$USERADDCOMMAND --help 2>&1|${GREPCOMMAND} "\-r"`;