--- NX/scripts/setup/nxserver.orig	2012-05-03 11:44:18.486001418 +0200
+++ NX/scripts/setup/nxserver	2012-05-03 11:59:12.624000346 +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
@@ -2061,6 +2074,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 +3015,9 @@
     elif [ "$system" = "fedora" ];
     then
       detectedSystem="Fedora"
+    elif [ "$system" = "magellan" ];
+    then
+      detectedSystem="Magellan-Linux"
     elif [ "$system" = "debian" ];
     then
       detectedSystem="Debian"
@@ -3390,6 +3407,7 @@
       "suse"               ) ;;
       "mandriva"           ) ;;
       "fedora"             ) ;;
+      "magellan"           ) ;;
       "debian"             ) ;;
       "solaris"            ) ;;
       "macosx"             ) ;;
@@ -3530,6 +3548,7 @@
 /etc/debian_version
 /etc/debian_release
 /etc/fedora-release
+/etc/mageversion
 /etc/gentoo-release
 /etc/immunix-release
 knoppix_version
@@ -3559,6 +3578,7 @@
 /etc/va-release
 /etc/yellowdog-release
 /etc/system-release
+/etc/os-release
 )
 
 getVersionFromLSB()
@@ -5007,6 +5027,12 @@
 
 removeNXinit () {
 
+  # do nothing on magellan
+  if [ "$system" = "magellan" ];
+  then
+     return
+  fi
+
   if [ "${system}" = "fedora" ] || [ "${system}" = "redhat" ] || [ "${system}" = "suse" ];
   then
     if [ -f "/sbin/chkconfig" ];
@@ -5215,6 +5241,12 @@
 
 addNXinit () {
 
+  # do nothing on magellan
+  if [ "$system" = "magellan" ];
+  then
+     return
+  fi
+
   if [ "${system}" = "macosx" ];
   then
     return 0
@@ -7656,6 +7688,7 @@
 /etc/server-fedora.cfg.sample
 /etc/server-mandriva.cfg.sample
 /etc/server-redhat.cfg.sample
+/etc/server-magellan.cfg.sample
 /etc/server-suse.cfg.sample
 /etc/server-solaris.cfg.sample
 /etc/server-macosx.cfg.sample
@@ -8707,6 +8740,12 @@
 
 addNxhttpdUserLinux () {
 
+  # simply abort if the user exist. on magellan this user is already created.
+  if id nxhttpd > /dev/null 2>&1
+  then
+     return
+  fi
+
   checkNxhttpdGroupExist
   if [ "x${ret_checkNxhttpdGroupExist}" = "x0" ];
   then