Contents of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxserver-magellan.patch
Parent Directory | Revision Log
Revision 1764 -
(show annotations)
(download)
Thu May 3 13:12:06 2012 UTC (12 years, 1 month ago) by niro
File size: 2711 byte(s)
Thu May 3 13:12:06 2012 UTC (12 years, 1 month ago) by niro
File size: 2711 byte(s)
-added patches and files for nx 4.0.181
1 | --- NX/scripts/setup/nxserver.orig 2012-05-03 11:44:18.486001418 +0200 |
2 | +++ NX/scripts/setup/nxserver 2012-05-03 11:59:12.624000346 +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 | @@ -5007,6 +5027,12 @@ |
73 | |
74 | removeNXinit () { |
75 | |
76 | + # do nothing on magellan |
77 | + if [ "$system" = "magellan" ]; |
78 | + then |
79 | + return |
80 | + fi |
81 | + |
82 | if [ "${system}" = "fedora" ] || [ "${system}" = "redhat" ] || [ "${system}" = "suse" ]; |
83 | then |
84 | if [ -f "/sbin/chkconfig" ]; |
85 | @@ -5215,6 +5241,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 0 |
98 | @@ -7656,6 +7688,7 @@ |
99 | /etc/server-fedora.cfg.sample |
100 | /etc/server-mandriva.cfg.sample |
101 | /etc/server-redhat.cfg.sample |
102 | +/etc/server-magellan.cfg.sample |
103 | /etc/server-suse.cfg.sample |
104 | /etc/server-solaris.cfg.sample |
105 | /etc/server-macosx.cfg.sample |
106 | @@ -8707,6 +8740,12 @@ |
107 | |
108 | addNxhttpdUserLinux () { |
109 | |
110 | + # simply abort if the user exist. on magellan this user is already created. |
111 | + if id nxhttpd > /dev/null 2>&1 |
112 | + then |
113 | + return |
114 | + fi |
115 | + |
116 | checkNxhttpdGroupExist |
117 | if [ "x${ret_checkNxhttpdGroupExist}" = "x0" ]; |
118 | then |