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

--- NX/scripts/setup/nxnode.orig	2012-05-07 23:33:29.906982523 +0200
+++ NX/scripts/setup/nxnode	2012-05-07 23:37:46.136982523 +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"`;
--- NX/scripts/etc/nxnode.orig	2012-05-07 23:33:22.231982523 +0200
+++ NX/scripts/etc/nxnode	2012-05-07 23:35:08.153982523 +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
1	--- NX/scripts/setup/nxnode.orig 2012-05-07 23:33:29.906982523 +0200
2	+++ NX/scripts/setup/nxnode 2012-05-07 23:37:46.136982523 +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	@@ -5329,6 +5358,12 @@
112
113	removeNXinit ()
114	{
115	+ # do nothing on magellan
116	+ if [ "$system" = "magellan" ];
117	+ then
118	+ return
119	+ fi
120	+
121	tmp=""
122
123	if [ "$system" = "fedora" ] \|\| [ "$system" = "redhat" ] \|\| [ "$system" = "suse" ];
124	@@ -5535,6 +5570,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
137	@@ -7217,6 +7258,7 @@
138	/etc/node-fedora.cfg.sample
139	/etc/node-mandriva.cfg.sample
140	/etc/node-redhat.cfg.sample
141	+/etc/node-magellan.cfg.sample
142	/etc/node-suse.cfg.sample
143	/etc/node-solaris.cfg.sample
144	/etc/node-macosx.cfg.sample
145	@@ -7878,6 +7920,13 @@
146	#
147
148	addNXUserLinux () {
149	+
150	+ # simply abort if the user exist. on magellan this user is already created.
151	+ if id nx > /dev/null 2>&1
152	+ then
153	+ return
154	+ fi
155	+
156	if [ "x$system" != "xdebian" ]
157	then
158	sysuser=`$USERADDCOMMAND --help 2>&1\|${GREPCOMMAND} "\-r"`;
159	--- NX/scripts/etc/nxnode.orig 2012-05-07 23:33:22.231982523 +0200
160	+++ NX/scripts/etc/nxnode 2012-05-07 23:35:08.153982523 +0200
161	@@ -19,6 +19,9 @@
162	elif [ -x /usr/bin/awk ]
163	then
164	COMMAND_AWK="/usr/bin/awk"
165	+elif [ -x /bin/awk ]
166	+then
167	+ COMMAND_AWK="/bin/awk"
168	else
169	COMMAND_AWK="awk"
170	fi