Annotation of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxnode-magellan.patch
Parent Directory | Revision Log
Revision 1764 -
(hide annotations)
(download)
Thu May 3 13:12:06 2012 UTC (12 years, 4 months ago) by niro
File size: 2667 byte(s)
Thu May 3 13:12:06 2012 UTC (12 years, 4 months ago) by niro
File size: 2667 byte(s)
-added patches and files for nx 4.0.181
1 | niro | 1764 | --- NX/scripts/setup/nxnode.orig 2012-05-03 11:33:22.762002529 +0200 |
2 | +++ NX/scripts/setup/nxnode 2012-05-03 11:41:28.854001656 +0200 | ||
3 | @@ -85,6 +85,13 @@ | ||
4 | { | ||
5 | ret_getLinuxName=0 | ||
6 | |||
7 | + # prefer os-release | ||
8 | + if [ -f /etc/os-release ]; | ||
9 | + then | ||
10 | + system=$(source /etc/os-release; echo "${ID}") | ||
11 | + return 0 | ||
12 | + fi | ||
13 | + | ||
14 | if [ -f /etc/SuSE-release ]; | ||
15 | then | ||
16 | system=suse | ||
17 | @@ -109,6 +116,12 @@ | ||
18 | return 0 | ||
19 | fi | ||
20 | |||
21 | + if [ -f /etc/mageversion ]; | ||
22 | + then | ||
23 | + system=magellan | ||
24 | + return 0 | ||
25 | + fi | ||
26 | + | ||
27 | if [ -f /etc/debian_version ]; | ||
28 | then | ||
29 | system=debian | ||
30 | @@ -2061,6 +2074,7 @@ | ||
31 | ${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." | ||
32 | ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." | ||
33 | ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." | ||
34 | + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc." | ||
35 | } | ||
36 | |||
37 | updatePathsInFile () | ||
38 | @@ -3001,6 +3015,9 @@ | ||
39 | elif [ "$system" = "fedora" ]; | ||
40 | then | ||
41 | detectedSystem="Fedora" | ||
42 | + elif [ "$system" = "magellan" ]; | ||
43 | + then | ||
44 | + detectedSystem="Magellan-Linux" | ||
45 | elif [ "$system" = "debian" ]; | ||
46 | then | ||
47 | detectedSystem="Debian" | ||
48 | @@ -3390,6 +3407,7 @@ | ||
49 | "suse" ) ;; | ||
50 | "mandriva" ) ;; | ||
51 | "fedora" ) ;; | ||
52 | + "magellan" ) ;; | ||
53 | "debian" ) ;; | ||
54 | "solaris" ) ;; | ||
55 | "macosx" ) ;; | ||
56 | @@ -3530,6 +3548,7 @@ | ||
57 | /etc/debian_version | ||
58 | /etc/debian_release | ||
59 | /etc/fedora-release | ||
60 | +/etc/mageversion | ||
61 | /etc/gentoo-release | ||
62 | /etc/immunix-release | ||
63 | knoppix_version | ||
64 | @@ -3559,6 +3578,7 @@ | ||
65 | /etc/va-release | ||
66 | /etc/yellowdog-release | ||
67 | /etc/system-release | ||
68 | +/etc/os-release | ||
69 | ) | ||
70 | |||
71 | getVersionFromLSB() | ||
72 | @@ -5329,6 +5349,12 @@ | ||
73 | |||
74 | removeNXinit () | ||
75 | { | ||
76 | + # do nothing on magellan | ||
77 | + if [ "$system" = "magellan" ]; | ||
78 | + then | ||
79 | + return | ||
80 | + fi | ||
81 | + | ||
82 | tmp="" | ||
83 | |||
84 | if [ "$system" = "fedora" ] || [ "$system" = "redhat" ] || [ "$system" = "suse" ]; | ||
85 | @@ -5535,6 +5561,12 @@ | ||
86 | |||
87 | addNXinit () { | ||
88 | |||
89 | + # do nothing on magellan | ||
90 | + if [ "$system" = "magellan" ]; | ||
91 | + then | ||
92 | + return | ||
93 | + fi | ||
94 | + | ||
95 | if [ "${system}" = "macosx" ]; | ||
96 | then | ||
97 | return | ||
98 | @@ -7217,6 +7249,7 @@ | ||
99 | /etc/node-fedora.cfg.sample | ||
100 | /etc/node-mandriva.cfg.sample | ||
101 | /etc/node-redhat.cfg.sample | ||
102 | +/etc/node-magellan.cfg.sample | ||
103 | /etc/node-suse.cfg.sample | ||
104 | /etc/node-solaris.cfg.sample | ||
105 | /etc/node-macosx.cfg.sample | ||
106 | @@ -7878,6 +7911,13 @@ | ||
107 | # | ||
108 | |||
109 | addNXUserLinux () { | ||
110 | + | ||
111 | + # simply abort if the user exist. on magellan this user is already created. | ||
112 | + if id nx > /dev/null 2>&1 | ||
113 | + then | ||
114 | + return | ||
115 | + fi | ||
116 | + | ||
117 | if [ "x$system" != "xdebian" ] | ||
118 | then | ||
119 | sysuser=`$USERADDCOMMAND --help 2>&1|${GREPCOMMAND} "\-r"`; |