diff -Naur NX/scripts/setup/nxserver NX-magellan/scripts/setup/nxserver
--- NX/scripts/setup/nxserver	2008-02-13 13:21:30.000000000 +0100
+++ NX-magellan/scripts/setup/nxserver	2008-03-27 10:14:09.000000000 +0100
@@ -597,6 +597,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" ];
@@ -743,6 +749,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"
 
@@ -857,6 +869,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=`useradd --help 2>&1|grep "\-r"`;
@@ -2514,6 +2533,11 @@
   system=fedora
 fi
 
+if [ -f /etc/mageversion ];
+then
+  system=magellan
+fi
+
 if [ "x$system" = "x" -a -f /etc/release ];
 then
   system=solaris
@@ -2549,6 +2573,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
@@ -2700,20 +2725,20 @@
     fi
   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"
-    printMsg "Cannot add user: nx" "error"
-    printMsg "User: nx already exists" "error"
-    printMsgNoDot "To fix the problem, you may try to completely uninstall NX" 
-    printMsgNoDot "Server and install it from scratch. If this is not enough,"
-    printMsgNoDot "please delete the nx user by using the system commands and"
-    printMsg "proceed with a new installation of NX Server"
-    exit 1
-  fi
+# do not run this on magellan. the user 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"
+#    printMsg "Cannot add user: nx" "error"
+#    printMsg "User: nx already exists" "error"
+#    printMsgNoDot "To fix the problem, you may try to completely uninstall NX" 
+#    printMsgNoDot "Server and install it from scratch. If this is not enough,"
+#    printMsgNoDot "please delete the nx user by using the system commands and"
+#    printMsg "proceed with a new installation of NX Server"
+#    exit 1
+#  fi
 
   LOGFILE="$INSTALLOG"
   createLogdirectory