Annotation of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxnode-magellan-2.patch
Parent Directory | Revision Log
Revision 1767 -
(hide annotations)
(download)
Tue May 8 11:11:05 2012 UTC (12 years, 4 months ago) by niro
File size: 32721 byte(s)
Tue May 8 11:11:05 2012 UTC (12 years, 4 months ago) by niro
File size: 32721 byte(s)
-reworked patches
1 | niro | 1767 | diff -Naur src-nxnode/NX/etc/node-magellan.cfg.sample src-nxnode-magellan/NX/etc/node-magellan.cfg.sample |
2 | --- src-nxnode/NX/etc/node-magellan.cfg.sample 1970-01-01 01:00:00.000000000 +0100 | ||
3 | +++ src-nxnode-magellan/NX/etc/node-magellan.cfg.sample 2012-05-08 13:59:03.237982523 +0200 | ||
4 | @@ -0,0 +1,513 @@ | ||
5 | +###################################################################### | ||
6 | +# # | ||
7 | +# Copyright (c) 2001, 2012 NoMachine, http://www.nomachine.com. # | ||
8 | +# # | ||
9 | +# All rights reserved. # | ||
10 | +# # | ||
11 | +###################################################################### | ||
12 | +# | ||
13 | +# based on node-debian.cfg.sample | ||
14 | +# | ||
15 | + | ||
16 | +# Some configuration keys are used to set specific limits, such as the | ||
17 | +# maximum size for the session log. To remove a limitation, set the | ||
18 | +# corresponding key to value '0' or 'Unlimited'. | ||
19 | + | ||
20 | +# | ||
21 | +# Set config file format version. | ||
22 | +# | ||
23 | +ConfigFileVersion 4.0 | ||
24 | + | ||
25 | +# | ||
26 | +# Set the log level of NX Node. NX Node logs to the syslog all the | ||
27 | +# events that are <= to the level specified below, according to the | ||
28 | +# following convention: | ||
29 | +# | ||
30 | +# KERN_ERR 3: Error condition. | ||
31 | +# KERN_INFO 6: Informational. | ||
32 | +# KERN_DEBUG 7: Debug messages. | ||
33 | +# | ||
34 | +# NX Node uses level 6 in the syslog to log the event. This | ||
35 | +# is intended to override settings on the local syslog configuration | ||
36 | +# that would prevent the event from being actually logged. | ||
37 | +# | ||
38 | +# The suggested values are: | ||
39 | +# | ||
40 | +# 6: This is the default value. Only the important events | ||
41 | +# are logged. | ||
42 | +# | ||
43 | +# 7: Set the log level to debug. | ||
44 | +# | ||
45 | +#SessionLogLevel 6 | ||
46 | + | ||
47 | +# | ||
48 | +# Redirect NX Node to log to a custom file instead of logging | ||
49 | +# to the system log, usually the /var/log/messages file. | ||
50 | +# | ||
51 | +#SystemLogFile /tmp/NX.log | ||
52 | + | ||
53 | +# | ||
54 | +# Specify hostname for the NX Node. | ||
55 | +# | ||
56 | +#NodeName localhost.localdomain | ||
57 | + | ||
58 | +# | ||
59 | +# Enable or disable the automatic clean-up of NX session directories | ||
60 | +# at the time sessions are terminated: | ||
61 | +# | ||
62 | +# 1: Enabled. This is the default value. | ||
63 | +# | ||
64 | +# 0: Disabled. Directories are prefixed by 'T-' and left | ||
65 | +# for further reference. | ||
66 | +# | ||
67 | +#SessionLogClean 1 | ||
68 | + | ||
69 | +# | ||
70 | +# Enable or disable NX Node to log the X client stderr. | ||
71 | +# | ||
72 | +# 1: Enabled. The standard error of the X clients is redirected to | ||
73 | +# the 'clients' file in the session directory. | ||
74 | +# | ||
75 | +# 0: Disabled. The standard error of the X clients is redirected to | ||
76 | +# /dev/null. | ||
77 | +# | ||
78 | +#ClientLog 1 | ||
79 | + | ||
80 | +# | ||
81 | +# Set the maximum size, expressed in bytes, allowed for the X clients | ||
82 | +# log. The node will terminate the session if this limit is exceeded. | ||
83 | +# | ||
84 | +#ClientLogLimit 0 | ||
85 | + | ||
86 | +# | ||
87 | +# Set the maximum size, expressed in bytes, allowed for the session | ||
88 | +# log. The node will terminate the session if this limit is exceeded. | ||
89 | +# | ||
90 | +#SessionLogLimit 0 | ||
91 | + | ||
92 | +# | ||
93 | +# Set the maximum amount of data that can be copied from within the | ||
94 | +# NX session to the client. The default value is 0, i.e. unlimited. | ||
95 | +# Limit for the size of the buffer on copy operations needs to be | ||
96 | +# specified in bytes. | ||
97 | +# | ||
98 | +#ClipboardBufferLimit 0 | ||
99 | + | ||
100 | +# | ||
101 | +# Enable or disable SSH encryption of all traffic between server and | ||
102 | +# node. | ||
103 | +# | ||
104 | +# 1: Enabled. Unencrypted connections between the server and | ||
105 | +# the node will be allowed. | ||
106 | +# | ||
107 | +# 0: Disabled. Forbid the use of unencrypted connections. The | ||
108 | +# node will force the server to tunnel the proxy connections | ||
109 | +# over the encrypted channel. | ||
110 | +# | ||
111 | +# Session negotiation happens across an encrypted channel. The user | ||
112 | +# can specify if subsequent communication must take place through a | ||
113 | +# direct connection between the proxies or by tunneling it through SSH. | ||
114 | +# Uncomment the key and set the value to 0 to increase the security of | ||
115 | +# the node host or if NX Node is behind a firewall preventing the | ||
116 | +# access to the set of ports used by the NX Node. | ||
117 | +# | ||
118 | +# Unencrypted sessions require that the firewall lets the proxies | ||
119 | +# communicate over the TCP ports ranging from: | ||
120 | +# | ||
121 | +# DisplayBase + 4000 | ||
122 | +# | ||
123 | +# to: | ||
124 | +# | ||
125 | +# DisplayBase + 4000 + DisplayLimit | ||
126 | +# | ||
127 | +#EnableUnencryptedSession 1 | ||
128 | + | ||
129 | +# | ||
130 | +# Specify path and name of the client to be run by nxnode and nxagent, | ||
131 | +# for example for issuing dialog boxes and messages, instead of the | ||
132 | +# default nxclient. | ||
133 | +# | ||
134 | +#CommandClient /usr/NX/bin/nxclient | ||
135 | + | ||
136 | +# | ||
137 | +# Specify path and name of the command 'fuser' to identify processes | ||
138 | +# using files or sockets. | ||
139 | +# | ||
140 | +CommandFuser /bin/fuser | ||
141 | + | ||
142 | +# | ||
143 | +# Specify path and name of the command 'lsof' to list open files. | ||
144 | +# | ||
145 | +CommandLsof /usr/bin/lsof | ||
146 | + | ||
147 | +# | ||
148 | +# Specify path and name of the command 'xauth' to edit and display | ||
149 | +# the authorization information used when connecting to the X server. | ||
150 | +# | ||
151 | +#CommandXauth xauth | ||
152 | + | ||
153 | +# | ||
154 | +# Specify path and name of the command 'xdpyinfo' for displaying | ||
155 | +# information about an X server. | ||
156 | +# | ||
157 | +#CommandXdpyInfo xdpyinfo | ||
158 | + | ||
159 | +# | ||
160 | +# Specify path and name of the command 'xmodmap' to edit and display | ||
161 | +# the keyboard modifier map and keymap table. | ||
162 | +# | ||
163 | +#CommandXmodmap xmodmap | ||
164 | + | ||
165 | +# | ||
166 | +# Specify path and name of the command to start 'KDE'. | ||
167 | +# | ||
168 | +#CommandStartKDE "" | ||
169 | + | ||
170 | +# | ||
171 | +# Specify path and name of the command to start 'Gnome'. | ||
172 | +# | ||
173 | +#CommandStartGnome "" | ||
174 | + | ||
175 | +# | ||
176 | +# Specify path and name of the command to start 'CDE'. | ||
177 | +# | ||
178 | +#CommandStartCDE cdwm | ||
179 | + | ||
180 | +# | ||
181 | +# Specify path and name of the command to start the RDP Client. | ||
182 | +# | ||
183 | +#CommandStartRDP "rdesktop -f" | ||
184 | + | ||
185 | +# | ||
186 | +# Specify path and name of the command to start the RFB Client. | ||
187 | +# | ||
188 | +#CommandStartRFB "vncviewer -fullscreen" | ||
189 | + | ||
190 | +# | ||
191 | +# Enable or disable use of 'xkbcomp' command: | ||
192 | +# | ||
193 | +# 1: Enabled. Use 'xkbcomp' command. | ||
194 | +# | ||
195 | +# 0: Disabled. | ||
196 | +# | ||
197 | +#EnableCommandXkbComp 1 | ||
198 | + | ||
199 | +# | ||
200 | +# Specify path and name of the command 'xkbcomp' to compile XKB key- | ||
201 | +# board description. | ||
202 | +# | ||
203 | +#CommandXkbComp xkbcomp | ||
204 | + | ||
205 | +# | ||
206 | +# Specify location and file name of the keymap file used by 'xkbcomp'. | ||
207 | +# | ||
208 | +#XkbCompKeymapFile /etc/X11/xkb/keymap/xfree86 | ||
209 | + | ||
210 | +# | ||
211 | +# Specify the location and name of the SSH authorized keys file. | ||
212 | +# | ||
213 | +SSHAuthorizedKeys $(HOME)/.ssh/authorized_keys | ||
214 | + | ||
215 | +# | ||
216 | +# Specify the font server to be used by nxagent. By default nxagent | ||
217 | +# only uses the X11 system fonts. Uncomment the following line to | ||
218 | +# enable use of an X Font Server. | ||
219 | +# | ||
220 | +#AgentFontServer unix/:7100 | ||
221 | + | ||
222 | +# | ||
223 | +# Specify the path of default X window system startup script. | ||
224 | +# | ||
225 | +#DefaultXSession /etc/X11/xdm/Xsession | ||
226 | + | ||
227 | +# | ||
228 | +# Set the default DPI of the X server to the specified value. This | ||
229 | +# should normally not be required, but some desktop applications fail | ||
230 | +# to set an appropriate value and fall back to 75 DPI, which is the | ||
231 | +# value reported by default by the X server. | ||
232 | +# | ||
233 | +#DefaultXDPI 96 | ||
234 | + | ||
235 | +# | ||
236 | +# Specify the path of libraries to be added to the nxagent environment. | ||
237 | +# Be sure that NX libraries are listed first. | ||
238 | +# | ||
239 | +#AgentLibraryPath /lib | ||
240 | + | ||
241 | +# | ||
242 | +# Specify the path of libraries to be added to the NX proxy environment. | ||
243 | +# | ||
244 | +#ProxyLibraryPath /lib | ||
245 | + | ||
246 | +# | ||
247 | +# Enable or disable TCP_NODELAY setting in NX proxy. | ||
248 | +# | ||
249 | +# 1: Enabled. Let NX Client choose whether to enable or not TCP_NODELAY | ||
250 | +# on proxy socket. | ||
251 | +# | ||
252 | +# 0: Disabled. Disable TCP_NODELAY. | ||
253 | +# | ||
254 | +# Due to a bug in old Linux kernels, enabling TCP_NODELAY when running | ||
255 | +# sessions over PPP links can cause sessions to fail if a serious net- | ||
256 | +# work congestion is encountered. | ||
257 | +# | ||
258 | +#ProxyTCPNodelay 0 | ||
259 | + | ||
260 | +# | ||
261 | +# Specify a list of comma-separated options to be added to the NX | ||
262 | +# proxy transport. | ||
263 | +# | ||
264 | +#ProxyExtraOptions limit=256k,link=modem | ||
265 | + | ||
266 | +# | ||
267 | +# Append arguments to the command line used to run nxagent for X | ||
268 | +# (Unix sessions). | ||
269 | +# | ||
270 | +# Mutiple parameters can be specified by separating them with a blank | ||
271 | +# character. For security reasons, no shell interpretation is made. | ||
272 | +# | ||
273 | +#AgentExtraOptions "-nocomposite -noshpix" | ||
274 | + | ||
275 | +# | ||
276 | +# Specify the domain of the Windows Terminal Server. | ||
277 | +# | ||
278 | +#DefaultRDPDomain "" | ||
279 | + | ||
280 | +# | ||
281 | +# Specify the path of base directory where the NX Node has to mount | ||
282 | +# shares exported by the user. The default value is $(HOME)/MyShares. | ||
283 | +# | ||
284 | +#ShareBasePath $(HOME)/MyShares | ||
285 | + | ||
286 | +# | ||
287 | +# Specify the path of the directory holding CUPS binaries (e.g. the | ||
288 | +# 'lpoptions' program). | ||
289 | +# | ||
290 | +CUPSBinPath "" | ||
291 | + | ||
292 | +# | ||
293 | +# Specify the path of the directory holding CUPS programs and reserved | ||
294 | +# for administrative purposes (e.g. 'cupsd' or 'lpadmin'). | ||
295 | +# | ||
296 | +CUPSSbinPath "" | ||
297 | + | ||
298 | +# | ||
299 | +# Specify the path of directory holding the CUPS backend. | ||
300 | +# | ||
301 | +CUPSBackendPath "" | ||
302 | + | ||
303 | +# | ||
304 | +# Enable or disable CUPS support: | ||
305 | +# | ||
306 | +# 1: Enabled. Enable CUPS support. | ||
307 | +# | ||
308 | +# 0: Disabled. Disable CUPS support. | ||
309 | +# | ||
310 | +EnableCUPSSupport 0 | ||
311 | + | ||
312 | +# | ||
313 | +# Specify if NX Node has to add shared printers to CUPS by using the | ||
314 | +# IP address of the node or localhost. Specifying 'ip' is necessary | ||
315 | +# for CUPS versions earlier than 1.2, otherwise 'localhost' can be | ||
316 | +# used. | ||
317 | +# | ||
318 | +#CUPSAddPrinterMode localhost | ||
319 | + | ||
320 | +# | ||
321 | +# Allow NX Node to use the CIFS (SMB) file-sharing protocol to attach the | ||
322 | +# filesystem to the target directory set by the ShareBasePath key. | ||
323 | +# | ||
324 | +# 1: Enabled. The node will use smbfs to mount and unmount the client | ||
325 | +# shares. | ||
326 | +# | ||
327 | +# 0: Disabled. The node will forbid any attempt to mount the client | ||
328 | +# shares via smbfs. | ||
329 | +# | ||
330 | +EnableMountShareSMBFS 1 | ||
331 | + | ||
332 | +# | ||
333 | +# Allow NX Node the SSHFS file-sharing protocol to attach the | ||
334 | +# filesystem to the target directory set by the ShareBasePath key. | ||
335 | +# | ||
336 | +# 1: Enabled. The node will use fuse to mount and unmount the client | ||
337 | +# filesystem (SSHFS). | ||
338 | +# | ||
339 | +# 0: Disabled. The node will forbid any attempt to mount the client | ||
340 | +# filesystem. | ||
341 | +# | ||
342 | +EnableMountShareSSHFS 1 | ||
343 | + | ||
344 | +# | ||
345 | +# Specify the TCP port where the SSHD daemon is listening on the NX | ||
346 | +# Node host machine. | ||
347 | +# | ||
348 | +#SSHDPort 22 | ||
349 | + | ||
350 | +# | ||
351 | +# Accept or refuse the client connection if SSHD does not export | ||
352 | +# the 'SSH_CONNECTION' and 'SSH_CLIENT' variables in the environment | ||
353 | +# passed to the NX Node. | ||
354 | +# | ||
355 | +# 1: Refuse. Check the remote IP and don't accept the connection if it | ||
356 | +# can't be determined. | ||
357 | +# | ||
358 | +# 0: Accept. Check the remote IP and accept the connection even if the | ||
359 | +# remote IP is not provided. | ||
360 | +# | ||
361 | +#SSHDCheckIP 0 | ||
362 | + | ||
363 | +# | ||
364 | +# Enable or disable running nxsensor: | ||
365 | +# | ||
366 | +# 1: Enabled. | ||
367 | +# | ||
368 | +# 0: Disabled. | ||
369 | +# | ||
370 | +# Run the nxsensor daemon in the background. This daemon can be used | ||
371 | +# to produce statistics data about the node machine. Data is to be | ||
372 | +# queried and elaborated by the nxstat daemon running on the NX Server | ||
373 | +# host machine. | ||
374 | +# | ||
375 | +#EnableSensor 0 | ||
376 | + | ||
377 | +# | ||
378 | +# Specify the hostname or IP address where the nxstat daemon, in | ||
379 | +# charge of collecting and elaborating data provided by nxsensor, | ||
380 | +# is running. | ||
381 | +# | ||
382 | +#StatisticsHost 127.0.0.1 | ||
383 | + | ||
384 | +# | ||
385 | +# Specify the port where NX Server will contact the nxsensor daemon to | ||
386 | +# collect the statistics data. The key is also used by nxsensor to | ||
387 | +# find out the network interface where it will listen for incoming | ||
388 | +# connections. | ||
389 | +# | ||
390 | +#NodeSensorPort 19250 | ||
391 | + | ||
392 | +# | ||
393 | +# Specify the message to be shown to the user when the user starts the | ||
394 | +# session on this node for the first time. | ||
395 | +# | ||
396 | +#NodeFirstLoginGreeting "Welcome to your NX session" | ||
397 | + | ||
398 | +# | ||
399 | +# Specify the message to be shown to the user every time the user | ||
400 | +# starts a new session on this node. | ||
401 | +# | ||
402 | +#NodeLoginGreeting "Welcome to your NX session" | ||
403 | + | ||
404 | +# | ||
405 | +# Specify a different path to the default, i.e. user's home, where | ||
406 | +# the .nx directory has to be created to store session files. If it | ||
407 | +# doesn't exist yet, NX Node will try to create a sub-directory for | ||
408 | +# each of the users starting a session there, named as username, and | ||
409 | +# will create the .nx under that sub-directory. For example, if this | ||
410 | +# key is set to /tmp/nxdir/, when user nxtest runs the first session, | ||
411 | +# the node will try to create the /tmp/nxdir/nxtest/.nx directory. | ||
412 | +# The directory specifed in the UserNXDirectoryPath key needs to | ||
413 | +# have proper ownership and permissions set to ensure that the node, | ||
414 | +# running as the user, can access it. I.e. the directory should be | ||
415 | +# writeable for all users or alternatively, the administrator should | ||
416 | +# create a directory with proper ownership and permissions, named as | ||
417 | +# username, for each of the users who need to start sessions there. | ||
418 | +# | ||
419 | +#UserNXDirectoryPath "" | ||
420 | + | ||
421 | +# | ||
422 | +# Specify absolute path of the custom script to be executed before | ||
423 | +# the session start-up. The script can accept session ID, username | ||
424 | +# and session type as its input. | ||
425 | +# | ||
426 | +# E.g. UserScriptBeforeSessionStart /tmp/nxscript/script.sh | ||
427 | +# | ||
428 | +#UserScriptBeforeSessionStart "" | ||
429 | + | ||
430 | +# | ||
431 | +# Specify absolute path of the custom script to be executed after the | ||
432 | +# session start-up. The script can accept session ID, username and | ||
433 | +# session type as its input. | ||
434 | +# | ||
435 | +#UserScriptAfterSessionStart "" | ||
436 | + | ||
437 | +# | ||
438 | +# Specify absolute path of the custom script to be executed before | ||
439 | +# the session is disconnected. The script can accept session ID and | ||
440 | +# username as its input. | ||
441 | +# | ||
442 | +#UserScriptBeforeSessionDisconnect "" | ||
443 | + | ||
444 | +# | ||
445 | +# Specify absolute path of the custom script to be executed after the | ||
446 | +# session is disconnected. The script can accept session ID and user- | ||
447 | +# name as its input. | ||
448 | +# | ||
449 | +#UserScriptAfterSessionDisconnect "" | ||
450 | + | ||
451 | +# | ||
452 | +# Specify absolute path of the custom script to be executed before the | ||
453 | +# session is closed. The script can accept session ID and username as | ||
454 | +# its input. | ||
455 | +# | ||
456 | +#UserScriptBeforeSessionClose "" | ||
457 | + | ||
458 | +# | ||
459 | +# Specify absolute path of the custom script to be executed after the | ||
460 | +# session is closed. The script can accept session ID and username as | ||
461 | +# its input. | ||
462 | +# | ||
463 | +#UserScriptAfterSessionClose "" | ||
464 | + | ||
465 | +# | ||
466 | +# Specify absolute path of the custom script to be executed before | ||
467 | +# the session is reconnected. The script can accept session ID and | ||
468 | +# username as its input. | ||
469 | +# | ||
470 | +#UserScriptBeforeSessionReconnect "" | ||
471 | + | ||
472 | +# | ||
473 | +# Specify absolute path of the custom script to be executed after the | ||
474 | +# session is reconnected. The script can accept session ID and user- | ||
475 | +# name as its input. | ||
476 | +# | ||
477 | +#UserScriptAfterSessionReconnect "" | ||
478 | + | ||
479 | +# | ||
480 | +# Specify absolute path of the custom script to be executed after | ||
481 | +# session failure. The script can accept session ID, username and | ||
482 | +# session type as its input. | ||
483 | +# | ||
484 | +#UserScriptAfterSessionFailure "" | ||
485 | + | ||
486 | +# | ||
487 | +# Specify which audio interface should be used to provide sound in NX | ||
488 | +# Sessions. Possible key values are: 'pulseaudio', 'oss', 'alsa' and | ||
489 | +# 'disabled'. The initial values are set during installation process | ||
490 | +# automatically, based on detected system configuration. | ||
491 | +# | ||
492 | +#AudioInterface disabled | ||
493 | + | ||
494 | +# | ||
495 | +# Specify path and name of the command to start PulseAudio server. | ||
496 | +# | ||
497 | +#CommandStartPulseAudio "" | ||
498 | + | ||
499 | +# | ||
500 | +# Specify path and name of the program for session recording. | ||
501 | +# | ||
502 | +#CommandRecording /usr/NX/bin/nxmpeg | ||
503 | + | ||
504 | +# | ||
505 | +# Specify a list of comma-separated session types available on this | ||
506 | +# host. | ||
507 | +# | ||
508 | +#AvailableSessionTypes "" | ||
509 | + | ||
510 | +# | ||
511 | +# Specify for how long NX Node has to wait for a reply from NX Server | ||
512 | +# before considering that the connection with the server has been lost. | ||
513 | +# The default value, 120 seconds, lets NX Node wait for 2 minutes. Set | ||
514 | +# this value to 0 to disable timeout on the node. | ||
515 | +# | ||
516 | +#NodeConnectionTimeout 120 | ||
517 | + | ||
518 | diff -Naur src-nxnode/NX/etc/node-magellan.cfg.sample.personal src-nxnode-magellan/NX/etc/node-magellan.cfg.sample.personal | ||
519 | --- src-nxnode/NX/etc/node-magellan.cfg.sample.personal 1970-01-01 01:00:00.000000000 +0100 | ||
520 | +++ src-nxnode-magellan/NX/etc/node-magellan.cfg.sample.personal 2012-05-08 13:59:59.942982523 +0200 | ||
521 | @@ -0,0 +1,481 @@ | ||
522 | +###################################################################### | ||
523 | +# # | ||
524 | +# Copyright (c) 2001, 2012 NoMachine, http://www.nomachine.com. # | ||
525 | +# # | ||
526 | +# All rights reserved. # | ||
527 | +# # | ||
528 | +###################################################################### | ||
529 | +# | ||
530 | +# based on node-debian.cfg.sample.personal | ||
531 | +# | ||
532 | + | ||
533 | +# Some configuration keys are used to set specific limits, such as the | ||
534 | +# maximum size for the session log. To remove a limitation, set the | ||
535 | +# corresponding key to value '0' or 'Unlimited'. | ||
536 | + | ||
537 | +# | ||
538 | +# Set config file format version. | ||
539 | +# | ||
540 | +ConfigFileVersion 4.0 | ||
541 | + | ||
542 | +# | ||
543 | +# Set the log level of NX Node. NX Node logs to the syslog all the | ||
544 | +# events that are <= to the level specified below, according to the | ||
545 | +# following convention: | ||
546 | +# | ||
547 | +# KERN_ERR 3: Error condition. | ||
548 | +# KERN_INFO 6: Informational. | ||
549 | +# KERN_DEBUG 7: Debug messages. | ||
550 | +# | ||
551 | +# NX Node uses level 6 in the syslog to log the event. This | ||
552 | +# is intended to override settings on the local syslog configuration | ||
553 | +# that would prevent the event from being actually logged. | ||
554 | +# | ||
555 | +# The suggested values are: | ||
556 | +# | ||
557 | +# 6: This is the default value. Only the important events | ||
558 | +# are logged. | ||
559 | +# | ||
560 | +# 7: Set the log level to debug. | ||
561 | +# | ||
562 | +#SessionLogLevel 6 | ||
563 | + | ||
564 | +# | ||
565 | +# Redirect NX Node to log to a custom file instead of logging | ||
566 | +# to the system log, usually the /var/log/messages file. | ||
567 | +# | ||
568 | +#SystemLogFile /tmp/NX.log | ||
569 | + | ||
570 | +# | ||
571 | +# Specify hostname for the NX Node. | ||
572 | +# | ||
573 | +#NodeName localhost.localdomain | ||
574 | + | ||
575 | +# | ||
576 | +# Enable or disable the automatic clean-up of NX session directories | ||
577 | +# at the time sessions are terminated: | ||
578 | +# | ||
579 | +# 1: Enabled. This is the default value. | ||
580 | +# | ||
581 | +# 0: Disabled. Directories are prefixed by 'T-' and left | ||
582 | +# for further reference. | ||
583 | +# | ||
584 | +#SessionLogClean 1 | ||
585 | + | ||
586 | +# | ||
587 | +# Enable or disable NX Node to log the X client stderr. | ||
588 | +# | ||
589 | +# 1: Enabled. The standard error of the X clients is redirected to | ||
590 | +# the 'clients' file in the session directory. | ||
591 | +# | ||
592 | +# 0: Disabled. The standard error of the X clients is redirected to | ||
593 | +# /dev/null. | ||
594 | +# | ||
595 | +#ClientLog 1 | ||
596 | + | ||
597 | +# | ||
598 | +# Set the maximum size, expressed in bytes, allowed for the X clients | ||
599 | +# log. The node will terminate the session if this limit is exceeded. | ||
600 | +# | ||
601 | +#ClientLogLimit 0 | ||
602 | + | ||
603 | +# | ||
604 | +# Set the maximum size, expressed in bytes, allowed for the session | ||
605 | +# log. The node will terminate the session if this limit is exceeded. | ||
606 | +# | ||
607 | +#SessionLogLimit 0 | ||
608 | + | ||
609 | +# | ||
610 | +# Set the maximum amount of data that can be copied from within the | ||
611 | +# NX session to the client. The default value is 0, i.e. unlimited. | ||
612 | +# Limit for the size of the buffer on copy operations needs to be | ||
613 | +# specified in bytes. | ||
614 | +# | ||
615 | +#ClipboardBufferLimit 0 | ||
616 | + | ||
617 | +# | ||
618 | +# Enable or disable SSH encryption of all traffic between server and | ||
619 | +# node. | ||
620 | +# | ||
621 | +# 1: Enabled. Unencrypted connections between the server and | ||
622 | +# the node will be allowed. | ||
623 | +# | ||
624 | +# 0: Disabled. Forbid the use of unencrypted connections. The | ||
625 | +# node will force the server to tunnel the proxy connections | ||
626 | +# over the encrypted channel. | ||
627 | +# | ||
628 | +# Session negotiation happens across an encrypted channel. The user | ||
629 | +# can specify if subsequent communication must take place through a | ||
630 | +# direct connection between the proxies or by tunneling it through SSH. | ||
631 | +# Uncomment the key and set the value to 0 to increase the security of | ||
632 | +# the node host or if NX Node is behind a firewall preventing the | ||
633 | +# access to the set of ports used by the NX Node. | ||
634 | +# | ||
635 | +# Unencrypted sessions require that the firewall lets the proxies | ||
636 | +# communicate over the TCP ports ranging from: | ||
637 | +# | ||
638 | +# DisplayBase + 4000 | ||
639 | +# | ||
640 | +# to: | ||
641 | +# | ||
642 | +# DisplayBase + 4000 + DisplayLimit | ||
643 | +# | ||
644 | +#EnableUnencryptedSession 1 | ||
645 | + | ||
646 | +# | ||
647 | +# Specify path and name of the client to be run by nxnode and nxagent, | ||
648 | +# for example for issuing dialog boxes and messages, instead of the | ||
649 | +# default nxclient. | ||
650 | +# | ||
651 | +#CommandClient /usr/NX/bin/nxclient | ||
652 | + | ||
653 | +# | ||
654 | +# Specify path and name of the command 'fuser' to identify processes | ||
655 | +# using files or sockets. | ||
656 | +# | ||
657 | +CommandFuser /bin/fuser | ||
658 | + | ||
659 | +# | ||
660 | +# Specify path and name of the command 'lsof' to list open files. | ||
661 | +# | ||
662 | +CommandLsof /usr/bin/lsof | ||
663 | + | ||
664 | +# | ||
665 | +# Specify path and name of the command 'xauth' to edit and display | ||
666 | +# the authorization information used when connecting to the X server. | ||
667 | +# | ||
668 | +#CommandXauth xauth | ||
669 | + | ||
670 | +# | ||
671 | +# Specify path and name of the command 'xdpyinfo' for displaying | ||
672 | +# information about an X server. | ||
673 | +# | ||
674 | +#CommandXdpyInfo xdpyinfo | ||
675 | + | ||
676 | +# | ||
677 | +# Specify path and name of the command 'xmodmap' to edit and display | ||
678 | +# the keyboard modifier map and keymap table. | ||
679 | +# | ||
680 | +#CommandXmodmap xmodmap | ||
681 | + | ||
682 | +# | ||
683 | +# Specify path and name of the command to start 'KDE'. | ||
684 | +# | ||
685 | +#CommandStartKDE "" | ||
686 | + | ||
687 | +# | ||
688 | +# Specify path and name of the command to start 'Gnome'. | ||
689 | +# | ||
690 | +#CommandStartGnome "" | ||
691 | + | ||
692 | +# | ||
693 | +# Specify path and name of the command to start 'CDE'. | ||
694 | +# | ||
695 | +#CommandStartCDE cdwm | ||
696 | + | ||
697 | +# | ||
698 | +# Specify path and name of the command to start the RDP Client. | ||
699 | +# | ||
700 | +#CommandStartRDP "rdesktop -f" | ||
701 | + | ||
702 | +# | ||
703 | +# Specify path and name of the command to start the RFB Client. | ||
704 | +# | ||
705 | +#CommandStartRFB "vncviewer -fullscreen" | ||
706 | + | ||
707 | +# | ||
708 | +# Specify path and name of the program for session recording. | ||
709 | +# | ||
710 | +#CommandRecording /usr/NX/bin/nxmpeg | ||
711 | + | ||
712 | +# | ||
713 | +# Enable or disable use of 'xkbcomp' command: | ||
714 | +# | ||
715 | +# 1: Enabled. Use 'xkbcomp' command. | ||
716 | +# | ||
717 | +# 0: Disabled. | ||
718 | +# | ||
719 | +#EnableCommandXkbComp 1 | ||
720 | + | ||
721 | +# | ||
722 | +# Specify path and name of the command 'xkbcomp' to compile XKB key- | ||
723 | +# board description. | ||
724 | +# | ||
725 | +#CommandXkbComp xkbcomp | ||
726 | + | ||
727 | +# | ||
728 | +# Specify location and file name of the keymap file used by 'xkbcomp'. | ||
729 | +# | ||
730 | +#XkbCompKeymapFile /etc/X11/xkb/keymap/xfree86 | ||
731 | + | ||
732 | +# | ||
733 | +# Specify the font server to be used by nxagent. By default nxagent | ||
734 | +# only uses the X11 system fonts. Uncomment the following line to | ||
735 | +# enable use of an X Font Server. | ||
736 | +# | ||
737 | +#AgentFontServer unix/:7100 | ||
738 | + | ||
739 | +# | ||
740 | +# Specify the path of default X window system startup script. | ||
741 | +# | ||
742 | +#DefaultXSession /etc/X11/xdm/Xsession | ||
743 | + | ||
744 | +# | ||
745 | +# Set the default DPI of the X server to the specified value. This | ||
746 | +# should normally not be required, but some desktop applications fail | ||
747 | +# to set an appropriate value and fall back to 75 DPI, which is the | ||
748 | +# value reported by default by the X server. | ||
749 | +# | ||
750 | +#DefaultXDPI 96 | ||
751 | + | ||
752 | +# | ||
753 | +# Specify the path of libraries to be added to the nxagent environment. | ||
754 | +# Be sure that NX libraries are listed first. | ||
755 | +# | ||
756 | +#AgentLibraryPath /lib | ||
757 | + | ||
758 | +# | ||
759 | +# Specify the path of libraries to be added to the NX proxy environment. | ||
760 | +# | ||
761 | +#ProxyLibraryPath /lib | ||
762 | + | ||
763 | +# | ||
764 | +# Enable or disable TCP_NODELAY setting in NX proxy. | ||
765 | +# | ||
766 | +# 1: Enabled. Let NX Client choose whether to enable or not TCP_NODELAY | ||
767 | +# on proxy socket. | ||
768 | +# | ||
769 | +# 0: Disabled. Disable TCP_NODELAY. | ||
770 | +# | ||
771 | +# Due to a bug in old Linux kernels, enabling TCP_NODELAY when running | ||
772 | +# sessions over PPP links can cause sessions to fail if a serious net- | ||
773 | +# work congestion is encountered. | ||
774 | +# | ||
775 | +#ProxyTCPNodelay 0 | ||
776 | + | ||
777 | +# | ||
778 | +# Specify a list of comma-separated options to be added to the NX | ||
779 | +# proxy transport. | ||
780 | +# | ||
781 | +#ProxyExtraOptions limit=256k,link=modem | ||
782 | + | ||
783 | +# | ||
784 | +# Append arguments to the command line used to run nxagent for X | ||
785 | +# (Unix sessions). | ||
786 | +# | ||
787 | +# Mutiple parameters can be specified by separating them with a blank | ||
788 | +# character. For security reasons, no shell interpretation is made. | ||
789 | +# | ||
790 | +#AgentExtraOptions "-nocomposite -noshpix" | ||
791 | + | ||
792 | +# | ||
793 | +# Specify the domain of the Windows Terminal Server. | ||
794 | +# | ||
795 | +#DefaultRDPDomain "" | ||
796 | + | ||
797 | +# | ||
798 | +# Specify the path of base directory where the NX Node has to mount | ||
799 | +# shares exported by the user. The default value is $(HOME)/MyShares. | ||
800 | +# | ||
801 | +#ShareBasePath $(HOME)/MyShares | ||
802 | + | ||
803 | +# | ||
804 | +# Specify the path of the directory holding CUPS binaries (e.g. the | ||
805 | +# 'lpoptions' program). | ||
806 | +# | ||
807 | +CUPSBinPath "" | ||
808 | + | ||
809 | +# | ||
810 | +# Specify the path of the directory holding CUPS programs and reserved | ||
811 | +# for administrative purposes (e.g. 'cupsd' or 'lpadmin'). | ||
812 | +# | ||
813 | +CUPSSbinPath "" | ||
814 | + | ||
815 | +# | ||
816 | +# Specify the path of directory holding the CUPS backend. | ||
817 | +# | ||
818 | +CUPSBackendPath "" | ||
819 | + | ||
820 | +# | ||
821 | +# Enable or disable CUPS support: | ||
822 | +# | ||
823 | +# 1: Enabled. Enable CUPS support. | ||
824 | +# | ||
825 | +# 0: Disabled. Disable CUPS support. | ||
826 | +# | ||
827 | +EnableCUPSSupport 0 | ||
828 | + | ||
829 | +# | ||
830 | +# Allow NX Node to use the CIFS (SMB) file-sharing protocol to attach the | ||
831 | +# filesystem to the target directory set by the ShareBasePath key. | ||
832 | +# | ||
833 | +# 1: Enabled. The node will use smbfs to mount and unmount the client | ||
834 | +# shares. | ||
835 | +# | ||
836 | +# 0: Disabled. The node will forbid any attempt to mount the client | ||
837 | +# shares via smbfs. | ||
838 | +# | ||
839 | +EnableMountShareSMBFS 1 | ||
840 | + | ||
841 | +# | ||
842 | +# Allow NX Node the SSHFS file-sharing protocol to attach the | ||
843 | +# filesystem to the target directory set by the ShareBasePath key. | ||
844 | +# | ||
845 | +# 1: Enabled. The node will use fuse to mount and unmount the client | ||
846 | +# filesystem (SSHFS). | ||
847 | +# | ||
848 | +# 0: Disabled. The node will forbid any attempt to mount the client | ||
849 | +# filesystem. | ||
850 | +# | ||
851 | +EnableMountShareSSHFS 1 | ||
852 | + | ||
853 | +# | ||
854 | +# Enable or disable running nxsensor: | ||
855 | +# | ||
856 | +# 1: Enabled. | ||
857 | +# | ||
858 | +# 0: Disabled. | ||
859 | +# | ||
860 | +# Run the nxsensor daemon in the background. This daemon can be used | ||
861 | +# to produce statistics data about the node machine. Data is to be | ||
862 | +# queried and elaborated by the nxstat daemon running on the NX Server | ||
863 | +# host machine. | ||
864 | +# | ||
865 | +#EnableSensor 0 | ||
866 | + | ||
867 | +# | ||
868 | +# Specify the hostname or IP address where the nxstat daemon, in | ||
869 | +# charge of collecting and elaborating data provided by nxsensor, | ||
870 | +# is running. | ||
871 | +# | ||
872 | +#StatisticsHost 127.0.0.1 | ||
873 | + | ||
874 | +# | ||
875 | +# Specify the port where NX Server will contact the nxsensor daemon to | ||
876 | +# collect the statistics data. The key is also used by nxsensor to | ||
877 | +# find out the network interface where it will listen for incoming | ||
878 | +# connections. | ||
879 | +# | ||
880 | +#NodeSensorPort 19250 | ||
881 | + | ||
882 | +# | ||
883 | +# Specify the message to be shown to the user when the user starts the | ||
884 | +# session on this node for the first time. | ||
885 | +# | ||
886 | +#NodeFirstLoginGreeting "Welcome to your NX session" | ||
887 | + | ||
888 | +# | ||
889 | +# Specify the message to be shown to the user every time the user | ||
890 | +# starts a new session on this node. | ||
891 | +# | ||
892 | +#NodeLoginGreeting "Welcome to your NX session" | ||
893 | + | ||
894 | +# | ||
895 | +# Specify a different path to the default, i.e. user's home, where | ||
896 | +# the .nx directory has to be created to store session files. If it | ||
897 | +# doesn't exist yet, NX Node will try to create a sub-directory for | ||
898 | +# each of the users starting a session there, named as username, and | ||
899 | +# will create the .nx under that sub-directory. For example, if this | ||
900 | +# key is set to /tmp/nxdir/, when user nxtest runs the first session, | ||
901 | +# the node will try to create the /tmp/nxdir/nxtest/.nx directory. | ||
902 | +# The directory specifed in the UserNXDirectoryPath key needs to | ||
903 | +# have proper ownership and permissions set to ensure that the node, | ||
904 | +# running as the user, can access it. I.e. the directory should be | ||
905 | +# writeable for all users or alternatively, the administrator should | ||
906 | +# create a directory with proper ownership and permissions, named as | ||
907 | +# username, for each of the users who need to start sessions there. | ||
908 | +# | ||
909 | +#UserNXDirectoryPath "" | ||
910 | + | ||
911 | +# | ||
912 | +# Specify absolute path of the custom script to be executed before | ||
913 | +# the session start-up. The script can accept session ID, username | ||
914 | +# and session type as its input. | ||
915 | +# | ||
916 | +# E.g. UserScriptBeforeSessionStart /tmp/nxscript/script.sh | ||
917 | +# | ||
918 | +#UserScriptBeforeSessionStart "" | ||
919 | + | ||
920 | +# | ||
921 | +# Specify absolute path of the custom script to be executed after the | ||
922 | +# session start-up. The script can accept session ID, username and | ||
923 | +# session type as its input. | ||
924 | +# | ||
925 | +#UserScriptAfterSessionStart "" | ||
926 | + | ||
927 | +# | ||
928 | +# Specify absolute path of the custom script to be executed before | ||
929 | +# the session is disconnected. The script can accept session ID and | ||
930 | +# username as its input. | ||
931 | +# | ||
932 | +#UserScriptBeforeSessionDisconnect "" | ||
933 | + | ||
934 | +# | ||
935 | +# Specify absolute path of the custom script to be executed after the | ||
936 | +# session is disconnected. The script can accept session ID and user- | ||
937 | +# name as its input. | ||
938 | +# | ||
939 | +#UserScriptAfterSessionDisconnect "" | ||
940 | + | ||
941 | +# | ||
942 | +# Specify absolute path of the custom script to be executed before the | ||
943 | +# session is closed. The script can accept session ID and username as | ||
944 | +# its input. | ||
945 | +# | ||
946 | +#UserScriptBeforeSessionClose "" | ||
947 | + | ||
948 | +# | ||
949 | +# Specify absolute path of the custom script to be executed after the | ||
950 | +# session is closed. The script can accept session ID and username as | ||
951 | +# its input. | ||
952 | +# | ||
953 | +#UserScriptAfterSessionClose "" | ||
954 | + | ||
955 | +# | ||
956 | +# Specify absolute path of the custom script to be executed before | ||
957 | +# the session is reconnected. The script can accept session ID and | ||
958 | +# username as its input. | ||
959 | +# | ||
960 | +#UserScriptBeforeSessionReconnect "" | ||
961 | + | ||
962 | +# | ||
963 | +# Specify absolute path of the custom script to be executed after the | ||
964 | +# session is reconnected. The script can accept session ID and user- | ||
965 | +# name as its input. | ||
966 | +# | ||
967 | +#UserScriptAfterSessionReconnect "" | ||
968 | + | ||
969 | +# | ||
970 | +# Specify absolute path of the custom script to be executed after | ||
971 | +# session failure. The script can accept session ID, username and | ||
972 | +# session type as its input. | ||
973 | +# | ||
974 | +#UserScriptAfterSessionFailure "" | ||
975 | + | ||
976 | +# | ||
977 | +# Specify which audio interface should be used to provide sound in NX | ||
978 | +# Sessions. Possible key values are: 'pulseaudio', 'oss', 'alsa' and | ||
979 | +# 'disabled'. The initial values are set during installation process | ||
980 | +# automatically, based on detected system configuration. | ||
981 | +# | ||
982 | +#AudioInterface disabled | ||
983 | + | ||
984 | +# | ||
985 | +# Specify path and name of the command to start PulseAudio server. | ||
986 | +# | ||
987 | +#CommandStartPulseAudio "" | ||
988 | + | ||
989 | +# | ||
990 | +# Specify a list of comma-separated session types available on this | ||
991 | +# host. | ||
992 | +# | ||
993 | +#AvailableSessionTypes "" | ||
994 | + | ||
995 | +# | ||
996 | +# Specify for how long NX Node has to wait for a reply from NX Server | ||
997 | +# before considering that the connection with the server has been lost. | ||
998 | +# The default value, 120 seconds, lets NX Node wait for 2 minutes. Set | ||
999 | +# this value to 0 to disable timeout on the node. | ||
1000 | +# | ||
1001 | +#NodeConnectionTimeout 120 | ||
1002 | + | ||
1003 | diff -Naur src-nxnode/NX/scripts/etc/nxnode src-nxnode-magellan/NX/scripts/etc/nxnode | ||
1004 | --- src-nxnode/NX/scripts/etc/nxnode 2012-04-20 13:58:09.000000000 +0200 | ||
1005 | +++ src-nxnode-magellan/NX/scripts/etc/nxnode 2012-05-08 13:54:07.771982523 +0200 | ||
1006 | @@ -19,6 +19,9 @@ | ||
1007 | elif [ -x /usr/bin/awk ] | ||
1008 | then | ||
1009 | COMMAND_AWK="/usr/bin/awk" | ||
1010 | +elif [ -x /bin/awk ] | ||
1011 | +then | ||
1012 | + COMMAND_AWK="/bin/awk" | ||
1013 | else | ||
1014 | COMMAND_AWK="awk" | ||
1015 | fi | ||
1016 | diff -Naur src-nxnode/NX/scripts/setup/nxnode src-nxnode-magellan/NX/scripts/setup/nxnode | ||
1017 | --- src-nxnode/NX/scripts/setup/nxnode 2012-04-20 10:59:39.000000000 +0200 | ||
1018 | +++ src-nxnode-magellan/NX/scripts/setup/nxnode 2012-05-08 13:54:07.771982523 +0200 | ||
1019 | @@ -85,6 +85,13 @@ | ||
1020 | { | ||
1021 | ret_getLinuxName=0 | ||
1022 | |||
1023 | + # prefer os-release | ||
1024 | + if [ -f /etc/os-release ]; | ||
1025 | + then | ||
1026 | + system=$(source /etc/os-release; echo "${ID}") | ||
1027 | + return 0 | ||
1028 | + fi | ||
1029 | + | ||
1030 | if [ -f /etc/SuSE-release ]; | ||
1031 | then | ||
1032 | system=suse | ||
1033 | @@ -109,6 +116,12 @@ | ||
1034 | return 0 | ||
1035 | fi | ||
1036 | |||
1037 | + if [ -f /etc/mageversion ]; | ||
1038 | + then | ||
1039 | + system=magellan | ||
1040 | + return 0 | ||
1041 | + fi | ||
1042 | + | ||
1043 | if [ -f /etc/debian_version ]; | ||
1044 | then | ||
1045 | system=debian | ||
1046 | @@ -179,6 +192,9 @@ | ||
1047 | if [ -x "/bin/unlink" ]; | ||
1048 | then | ||
1049 | UNLINKCOMMAND="/bin/unlink" | ||
1050 | +elif [ -x "/usr/bin/unlink" ]; | ||
1051 | +then | ||
1052 | + UNLINKCOMMAND="/usr/bin/unlink" | ||
1053 | elif [ -x "/usr/sbin/unlink" ]; | ||
1054 | then | ||
1055 | UNLINKCOMMAND="/usr/sbin/unlink" | ||
1056 | @@ -236,6 +252,9 @@ | ||
1057 | if [ -x "/usr/bin/awk" ]; | ||
1058 | then | ||
1059 | AWKCOMMAND="/usr/bin/awk" | ||
1060 | + elif [ -x "/bin/awk" ]; | ||
1061 | + then | ||
1062 | + AWKCOMMAND="/bin/awk" | ||
1063 | else | ||
1064 | AWKCOMMAND="awk" | ||
1065 | fi | ||
1066 | @@ -293,7 +312,7 @@ | ||
1067 | SEDCOMMAND="sed" | ||
1068 | fi | ||
1069 | else | ||
1070 | - if [ -x "/bin/grep" ]; | ||
1071 | + if [ -x "/bin/sed" ]; | ||
1072 | then | ||
1073 | SEDCOMMAND="/bin/sed" | ||
1074 | else | ||
1075 | @@ -480,6 +499,9 @@ | ||
1076 | if [ -x "/sbin/pidof" ]; | ||
1077 | then | ||
1078 | PIDOFCOMMAND="/sbin/pidof" | ||
1079 | +elif [ -x "/bin/pidof" ]; | ||
1080 | +then | ||
1081 | + PIDOFCOMMAND="/bin/pidof" | ||
1082 | else | ||
1083 | PIDOFCOMMAND="pidof" | ||
1084 | fi | ||
1085 | @@ -2061,6 +2083,7 @@ | ||
1086 | ${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." | ||
1087 | ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." | ||
1088 | ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." | ||
1089 | + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc." | ||
1090 | } | ||
1091 | |||
1092 | updatePathsInFile () | ||
1093 | @@ -3001,6 +3024,9 @@ | ||
1094 | elif [ "$system" = "fedora" ]; | ||
1095 | then | ||
1096 | detectedSystem="Fedora" | ||
1097 | + elif [ "$system" = "magellan" ]; | ||
1098 | + then | ||
1099 | + detectedSystem="Magellan-Linux" | ||
1100 | elif [ "$system" = "debian" ]; | ||
1101 | then | ||
1102 | detectedSystem="Debian" | ||
1103 | @@ -3390,6 +3416,7 @@ | ||
1104 | "suse" ) ;; | ||
1105 | "mandriva" ) ;; | ||
1106 | "fedora" ) ;; | ||
1107 | + "magellan" ) ;; | ||
1108 | "debian" ) ;; | ||
1109 | "solaris" ) ;; | ||
1110 | "macosx" ) ;; | ||
1111 | @@ -3530,6 +3557,7 @@ | ||
1112 | /etc/debian_version | ||
1113 | /etc/debian_release | ||
1114 | /etc/fedora-release | ||
1115 | +/etc/mageversion | ||
1116 | /etc/gentoo-release | ||
1117 | /etc/immunix-release | ||
1118 | knoppix_version | ||
1119 | @@ -3559,6 +3587,7 @@ | ||
1120 | /etc/va-release | ||
1121 | /etc/yellowdog-release | ||
1122 | /etc/system-release | ||
1123 | +/etc/os-release | ||
1124 | ) | ||
1125 | |||
1126 | getVersionFromLSB() | ||
1127 | @@ -5329,6 +5358,12 @@ | ||
1128 | |||
1129 | removeNXinit () | ||
1130 | { | ||
1131 | + # do nothing on magellan | ||
1132 | + if [ "$system" = "magellan" ]; | ||
1133 | + then | ||
1134 | + return | ||
1135 | + fi | ||
1136 | + | ||
1137 | tmp="" | ||
1138 | |||
1139 | if [ "$system" = "fedora" ] || [ "$system" = "redhat" ] || [ "$system" = "suse" ]; | ||
1140 | @@ -5535,6 +5570,12 @@ | ||
1141 | |||
1142 | addNXinit () { | ||
1143 | |||
1144 | + # do nothing on magellan | ||
1145 | + if [ "$system" = "magellan" ]; | ||
1146 | + then | ||
1147 | + return | ||
1148 | + fi | ||
1149 | + | ||
1150 | if [ "${system}" = "macosx" ]; | ||
1151 | then | ||
1152 | return | ||
1153 | @@ -7217,6 +7258,7 @@ | ||
1154 | /etc/node-fedora.cfg.sample | ||
1155 | /etc/node-mandriva.cfg.sample | ||
1156 | /etc/node-redhat.cfg.sample | ||
1157 | +/etc/node-magellan.cfg.sample | ||
1158 | /etc/node-suse.cfg.sample | ||
1159 | /etc/node-solaris.cfg.sample | ||
1160 | /etc/node-macosx.cfg.sample | ||
1161 | @@ -7878,6 +7920,13 @@ | ||
1162 | # | ||
1163 | |||
1164 | addNXUserLinux () { | ||
1165 | + | ||
1166 | + # simply abort if the user exist. on magellan this user is already created. | ||
1167 | + if id nx > /dev/null 2>&1 | ||
1168 | + then | ||
1169 | + return | ||
1170 | + fi | ||
1171 | + | ||
1172 | if [ "x$system" != "xdebian" ] | ||
1173 | then | ||
1174 | sysuser=`$USERADDCOMMAND --help 2>&1|${GREPCOMMAND} "\-r"`; |