Annotation of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.0_pre1-magellan.patch
Parent Directory
| 
Revision Log
Revision 1240 -
(hide annotations)
(download)
Thu Dec 23 17:21:35 2010 UTC (13 years, 5 months ago) by niro
File size: 2374 byte(s)
Thu Dec 23 17:21:35 2010 UTC (13 years, 5 months ago) by niro
File size: 2374 byte(s)
updated magellan patches for nx-4.0.0_pre1
| 1 | niro | 1240 | diff -Naur nxserver/NX/scripts/setup/nxserver nxserver-magellan/NX/scripts/setup/nxserver |
| 2 | --- nxserver/NX/scripts/setup/nxserver 2010-12-21 13:18:13.000000000 +0100 | ||
| 3 | +++ nxserver-magellan/NX/scripts/setup/nxserver 2010-12-23 18:21:05.000000000 +0100 | ||
| 4 | @@ -98,6 +98,11 @@ | ||
| 5 | return 0 | ||
| 6 | fi | ||
| 7 | |||
| 8 | + if [ -f /etc/mageversion ]; | ||
| 9 | + then | ||
| 10 | + system=magellan | ||
| 11 | + fi | ||
| 12 | + | ||
| 13 | return 1 | ||
| 14 | } | ||
| 15 | |||
| 16 | @@ -1957,6 +1962,9 @@ | ||
| 17 | elif [ "$system" = "mandrake" ]; | ||
| 18 | then | ||
| 19 | detectedSystem="Mandriva" | ||
| 20 | + elif [ "$system" = "magellan" ]; | ||
| 21 | + then | ||
| 22 | + detectedSystem="Magellan-Linux" | ||
| 23 | fi | ||
| 24 | |||
| 25 | printMsg "Autodetected system: $detectedSystem" | ||
| 26 | @@ -2171,6 +2179,7 @@ | ||
| 27 | echo " Xandros Desktop 4.1/Xandros Server 2.0 etc." | ||
| 28 | echo " solaris Sun Solaris 10.0 etc." | ||
| 29 | echo " fedora Fedora 10/11/12/13 etc." | ||
| 30 | + echo " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x etc." | ||
| 31 | |||
| 32 | echo "$errMsg" | ||
| 33 | |||
| 34 | @@ -2309,6 +2318,7 @@ | ||
| 35 | "debian" ) ;; | ||
| 36 | "solaris" ) ;; | ||
| 37 | "macosx" ) ;; | ||
| 38 | + "magellan" ) ;; | ||
| 39 | "" ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;; | ||
| 40 | * ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;; | ||
| 41 | esac | ||
| 42 | @@ -2447,6 +2457,7 @@ | ||
| 43 | /etc/debian_release | ||
| 44 | /etc/fedora-release | ||
| 45 | /etc/gentoo-release | ||
| 46 | +/etc/mageversion | ||
| 47 | /etc/immunix-release | ||
| 48 | knoppix_version | ||
| 49 | /etc/lfs-release | ||
| 50 | @@ -3333,6 +3344,12 @@ | ||
| 51 | |||
| 52 | removeNXinit () { | ||
| 53 | |||
| 54 | + # do nothing on magellan | ||
| 55 | + if [ "$system" = "magellan" ]; | ||
| 56 | + then | ||
| 57 | + return | ||
| 58 | + fi | ||
| 59 | + | ||
| 60 | if [ "$system" = "fedora" ] || [ "$system" = "redhat" ] || [ "$system" = "suse" ]; | ||
| 61 | then | ||
| 62 | if [ -f "/sbin/chkconfig" ]; | ||
| 63 | @@ -3537,6 +3554,12 @@ | ||
| 64 | |||
| 65 | addNXinit () { | ||
| 66 | |||
| 67 | + # do nothing on magellan | ||
| 68 | + if [ "$system" = "magellan" ]; | ||
| 69 | + then | ||
| 70 | + return | ||
| 71 | + fi | ||
| 72 | + | ||
| 73 | runCommand "cat '$NX_ROOT/scripts/init/nxserver' > /etc/init.d/nxserver" "Unable to create: /etc/init.d/nxserver" "warn" | ||
| 74 | runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of /etc/init.d/nxserver file" "warn" | ||
| 75 | |||
| 76 | @@ -6751,6 +6774,12 @@ | ||
| 77 | |||
| 78 | addNxhtdUserLinux () { | ||
| 79 | |||
| 80 | + # simply abort if the user exist. on magellan this user is already created. | ||
| 81 | + if id nxhtd > /dev/null 2>&1 | ||
| 82 | + then | ||
| 83 | + return | ||
| 84 | + fi | ||
| 85 | + | ||
| 86 | checkNxhtdGroupExist | ||
| 87 | if [ "x$?" = "x0" ]; | ||
| 88 | then |