nxserver-freeedition/patches/nxserver-freeedition-3.0.0-magellan.patch

diff -Naur NX/scripts/setup/nxserver NX-magellan/scripts/setup/nxserver
--- NX/scripts/setup/nxserver	2007-06-20 13:10:34.000000000 +0200
+++ NX-magellan/scripts/setup/nxserver	2007-06-27 16:55:41.000000000 +0200
@@ -535,6 +535,12 @@
 
 removeNXinit () {
 
+  # do nothing on magellan
+  if [ "$system" = "magellan" ];
+  then
+     return
+  fi
+
   runCommand "$RMCOMMAND -f /etc/init.d/nxserver" "Unable to remove '/etc/init.d/nxserver'" "warn"
 
   if [ "$system" = "solaris" ];
@@ -681,6 +687,12 @@
 
 addNXinit () {
 
+ # do nothing on magellan
+ if [ "$system" = "magellan" ];
+ then
+    return
+ fi
+
  runCommand "cat $NODE_ROOT/scripts/init/nxserver > /etc/init.d/nxserver" "Unable to create: '/etc/init.d/nxserver'" "warn"
  runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of '/etc/init.d/nxserver' file" "warn"
 
@@ -796,6 +808,12 @@
 
 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=`useradd --help 2>&1|grep "\-r"`;
@@ -2434,6 +2452,11 @@
   system=fedora
 fi
 
+if [ -f /etc/mageversion ];
+then
+  system=magellan
+fi
+
 if [ "x$system" = "x" -a -f /etc/release ];
 then
   system=solaris
@@ -2469,6 +2492,7 @@
     "fedora"             ) ;;
     "debian"             ) ;;
     "solaris"             ) ;;
+    "magellan"           ) ;;
     ""                 ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
     *                  ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
   esac
@@ -2615,13 +2639,14 @@
     return 0
   fi
   
-  result=`id nx 2>&1`
-  if [ $? = 0 ];
-  then
-    printMsg "Cannot add user: nx. User: nx already exists" "error"
-    printMsg "Please try to fix the problem by reinstalling the server" "error"
-    exit 1
-  fi
+# do not run this on magellan. the use is already installed.
+#  result=`id nx 2>&1`
+#  if [ $? = 0 ];
+#  then
+#    printMsg "Cannot add user: nx. User: nx already exists" "error"
+#    printMsg "Please try to fix the problem by reinstalling the server" "error"
+#    exit 1
+#  fi
 
   LOGFILE="$INSTALLOG"
   createLogdirectory
1	niro	226	diff -Naur NX/scripts/setup/nxserver NX-magellan/scripts/setup/nxserver
2			--- NX/scripts/setup/nxserver 2007-06-20 13:10:34.000000000 +0200
3			+++ NX-magellan/scripts/setup/nxserver 2007-06-27 16:55:41.000000000 +0200
4			@@ -535,6 +535,12 @@
5
6			removeNXinit () {
7
8			+ # do nothing on magellan
9			+ if [ "$system" = "magellan" ];
10			+ then
11			+ return
12			+ fi
13			+
14			runCommand "$RMCOMMAND -f /etc/init.d/nxserver" "Unable to remove '/etc/init.d/nxserver'" "warn"
15
16			if [ "$system" = "solaris" ];
17			@@ -681,6 +687,12 @@
18
19			addNXinit () {
20
21			+ # do nothing on magellan
22			+ if [ "$system" = "magellan" ];
23			+ then
24			+ return
25			+ fi
26			+
27			runCommand "cat $NODE_ROOT/scripts/init/nxserver > /etc/init.d/nxserver" "Unable to create: '/etc/init.d/nxserver'" "warn"
28			runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of '/etc/init.d/nxserver' file" "warn"
29
30			@@ -796,6 +808,12 @@
31
32			addNXUserLinux () {
33
34			+ # simply abort if the user exist. on magellan this user is already created.
35			+ if id nx > /dev/null 2>&1
36			+ then
37			+ return
38			+ fi
39			+
40			if [ "x$system" != "xdebian" ]
41			then
42			sysuser=`useradd --help 2>&1\|grep "\-r"`;
43			@@ -2434,6 +2452,11 @@
44			system=fedora
45			fi
46
47			+if [ -f /etc/mageversion ];
48			+then
49			+ system=magellan
50			+fi
51			+
52			if [ "x$system" = "x" -a -f /etc/release ];
53			then
54			system=solaris
55			@@ -2469,6 +2492,7 @@
56			"fedora" ) ;;
57			"debian" ) ;;
58			"solaris" ) ;;
59			+ "magellan" ) ;;
60			"" ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
61			* ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
62			esac
63			@@ -2615,13 +2639,14 @@
64			return 0
65			fi
66
67			- result=`id nx 2>&1`
68			- if [ $? = 0 ];
69			- then
70			- printMsg "Cannot add user: nx. User: nx already exists" "error"
71			- printMsg "Please try to fix the problem by reinstalling the server" "error"
72			- exit 1
73			- fi
74			+# do not run this on magellan. the use is already installed.
75			+# result=`id nx 2>&1`
76			+# if [ $? = 0 ];
77			+# then
78			+# printMsg "Cannot add user: nx. User: nx already exists" "error"
79			+# printMsg "Please try to fix the problem by reinstalling the server" "error"
80			+# exit 1
81			+# fi
82
83			LOGFILE="$INSTALLOG"
84			createLogdirectory