Contents of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxserver-magellan.patch
Parent Directory | Revision Log
Revision 1766 -
(show annotations)
(download)
Mon May 7 20:52:03 2012 UTC (12 years, 4 months ago) by niro
File size: 3752 byte(s)
Mon May 7 20:52:03 2012 UTC (12 years, 4 months ago) by niro
File size: 3752 byte(s)
-fixed patches
1 | --- NX/scripts/setup/nxserver.orig 2012-05-07 22:48:36.539982523 +0200 |
2 | +++ NX/scripts/setup/nxserver 2012-05-07 23:44:41.106982523 +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 | @@ -179,6 +192,9 @@ |
31 | if [ -x "/bin/unlink" ]; |
32 | then |
33 | UNLINKCOMMAND="/bin/unlink" |
34 | +elif [ -x "/usr/bin/unlink" ]; |
35 | +then |
36 | + UNLINKCOMMAND="/usr/bin/unlink" |
37 | elif [ -x "/usr/sbin/unlink" ]; |
38 | then |
39 | UNLINKCOMMAND="/usr/sbin/unlink" |
40 | @@ -236,6 +252,9 @@ |
41 | if [ -x "/usr/bin/awk" ]; |
42 | then |
43 | AWKCOMMAND="/usr/bin/awk" |
44 | + elif [ -x "/bin/awk" ]; |
45 | + then |
46 | + AWKCOMMAND="/bin/awk" |
47 | else |
48 | AWKCOMMAND="awk" |
49 | fi |
50 | @@ -293,7 +312,7 @@ |
51 | SEDCOMMAND="sed" |
52 | fi |
53 | else |
54 | - if [ -x "/bin/grep" ]; |
55 | + if [ -x "/bin/sed" ]; |
56 | then |
57 | SEDCOMMAND="/bin/sed" |
58 | else |
59 | @@ -480,6 +499,9 @@ |
60 | if [ -x "/sbin/pidof" ]; |
61 | then |
62 | PIDOFCOMMAND="/sbin/pidof" |
63 | +elif [ -x "/bin/pidof" ]; |
64 | +then |
65 | + PIDOFCOMMAND="/bin/pidof" |
66 | else |
67 | PIDOFCOMMAND="pidof" |
68 | fi |
69 | @@ -2061,6 +2083,7 @@ |
70 | ${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
71 | ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." |
72 | ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." |
73 | + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc." |
74 | } |
75 | |
76 | updatePathsInFile () |
77 | @@ -3001,6 +3024,9 @@ |
78 | elif [ "$system" = "fedora" ]; |
79 | then |
80 | detectedSystem="Fedora" |
81 | + elif [ "$system" = "magellan" ]; |
82 | + then |
83 | + detectedSystem="Magellan-Linux" |
84 | elif [ "$system" = "debian" ]; |
85 | then |
86 | detectedSystem="Debian" |
87 | @@ -3390,6 +3416,7 @@ |
88 | "suse" ) ;; |
89 | "mandriva" ) ;; |
90 | "fedora" ) ;; |
91 | + "magellan" ) ;; |
92 | "debian" ) ;; |
93 | "solaris" ) ;; |
94 | "macosx" ) ;; |
95 | @@ -3530,6 +3557,7 @@ |
96 | /etc/debian_version |
97 | /etc/debian_release |
98 | /etc/fedora-release |
99 | +/etc/mageversion |
100 | /etc/gentoo-release |
101 | /etc/immunix-release |
102 | knoppix_version |
103 | @@ -3559,6 +3587,7 @@ |
104 | /etc/va-release |
105 | /etc/yellowdog-release |
106 | /etc/system-release |
107 | +/etc/os-release |
108 | ) |
109 | |
110 | getVersionFromLSB() |
111 | @@ -5007,6 +5036,12 @@ |
112 | |
113 | removeNXinit () { |
114 | |
115 | + # do nothing on magellan |
116 | + if [ "$system" = "magellan" ]; |
117 | + then |
118 | + return |
119 | + fi |
120 | + |
121 | if [ "${system}" = "fedora" ] || [ "${system}" = "redhat" ] || [ "${system}" = "suse" ]; |
122 | then |
123 | if [ -f "/sbin/chkconfig" ]; |
124 | @@ -5215,6 +5250,12 @@ |
125 | |
126 | addNXinit () { |
127 | |
128 | + # do nothing on magellan |
129 | + if [ "$system" = "magellan" ]; |
130 | + then |
131 | + return |
132 | + fi |
133 | + |
134 | if [ "${system}" = "macosx" ]; |
135 | then |
136 | return 0 |
137 | @@ -7656,6 +7697,7 @@ |
138 | /etc/server-fedora.cfg.sample |
139 | /etc/server-mandriva.cfg.sample |
140 | /etc/server-redhat.cfg.sample |
141 | +/etc/server-magellan.cfg.sample |
142 | /etc/server-suse.cfg.sample |
143 | /etc/server-solaris.cfg.sample |
144 | /etc/server-macosx.cfg.sample |
145 | @@ -8707,6 +8749,12 @@ |
146 | |
147 | addNxhttpdUserLinux () { |
148 | |
149 | + # simply abort if the user exist. on magellan this user is already created. |
150 | + if id nxhttpd > /dev/null 2>&1 |
151 | + then |
152 | + return |
153 | + fi |
154 | + |
155 | checkNxhttpdGroupExist |
156 | if [ "x${ret_checkNxhttpdGroupExist}" = "x0" ]; |
157 | then |
158 | --- NX/scripts/etc/nxserver.orig 2012-05-07 22:58:20.445982523 +0200 |
159 | +++ NX/scripts/etc/nxserver 2012-05-07 22:58:34.831982523 +0200 |
160 | @@ -19,6 +19,9 @@ |
161 | elif [ -x /usr/bin/awk ] |
162 | then |
163 | COMMAND_AWK="/usr/bin/awk" |
164 | +elif [ -x /bin/awk ] |
165 | +then |
166 | + COMMAND_AWK="/bin/awk" |
167 | else |
168 | COMMAND_AWK="awk" |
169 | fi |