--- NX/scripts/setup/nxclient.orig	2012-05-07 23:19:21.137982523 +0200
+++ NX/scripts/setup/nxclient	2012-05-07 23:26:11.913982523 +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"
@@ -293,7 +309,7 @@
     SEDCOMMAND="sed"
   fi
 else
-  if [ -x "/bin/grep" ];
+  if [ -x "/bin/sed" ];
   then
     SEDCOMMAND="/bin/sed"
   else
@@ -480,6 +496,9 @@
 if [ -x "/sbin/pidof" ];
 then
   PIDOFCOMMAND="/sbin/pidof"
+elif [ -x "/bin/pidof" ];
+then
+  PIDOFCOMMAND="/bin/pidof"
 else
   PIDOFCOMMAND="pidof"
 fi
@@ -2061,6 +2080,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 +3021,9 @@
     elif [ "$system" = "fedora" ];
     then
       detectedSystem="Fedora"
+    elif [ "$system" = "magellan" ];
+    then
+      detectedSystem="Magellan-Linux"
     elif [ "$system" = "debian" ];
     then
       detectedSystem="Debian"
@@ -3390,6 +3413,7 @@
       "suse"               ) ;;
       "mandriva"           ) ;;
       "fedora"             ) ;;
+      "magellan"           ) ;;
       "debian"             ) ;;
       "solaris"            ) ;;
       "macosx"             ) ;;
@@ -3530,6 +3554,7 @@
 /etc/debian_version
 /etc/debian_release
 /etc/fedora-release
+/etc/mageversion
 /etc/gentoo-release
 /etc/immunix-release
 knoppix_version
@@ -3559,6 +3584,7 @@
 /etc/va-release
 /etc/yellowdog-release
 /etc/system-release
+/etc/os-release
 )
 
 getVersionFromLSB()