Magellan Linux

Contents of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.0_pre1-magellan.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1241 - (show annotations) (download)
Thu Dec 23 18:32:39 2010 UTC (13 years, 4 months ago) by niro
File size: 2743 byte(s)
fixed patches
1 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 19:33:03.000000000 +0100
4 @@ -98,6 +98,12 @@
5 return 0
6 fi
7
8 + if [ -f /etc/mageversion ];
9 + then
10 + system=magellan
11 + return 0
12 + fi
13 +
14 return 1
15 }
16
17 @@ -1957,6 +1963,9 @@
18 elif [ "$system" = "mandrake" ];
19 then
20 detectedSystem="Mandriva"
21 + elif [ "$system" = "magellan" ];
22 + then
23 + detectedSystem="Magellan-Linux"
24 fi
25
26 printMsg "Autodetected system: $detectedSystem"
27 @@ -2171,6 +2180,7 @@
28 echo " Xandros Desktop 4.1/Xandros Server 2.0 etc."
29 echo " solaris Sun Solaris 10.0 etc."
30 echo " fedora Fedora 10/11/12/13 etc."
31 + echo " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x etc."
32
33 echo "$errMsg"
34
35 @@ -2309,6 +2319,7 @@
36 "debian" ) ;;
37 "solaris" ) ;;
38 "macosx" ) ;;
39 + "magellan" ) ;;
40 "" ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
41 * ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
42 esac
43 @@ -2447,6 +2458,7 @@
44 /etc/debian_release
45 /etc/fedora-release
46 /etc/gentoo-release
47 +/etc/mageversion
48 /etc/immunix-release
49 knoppix_version
50 /etc/lfs-release
51 @@ -3333,6 +3345,12 @@
52
53 removeNXinit () {
54
55 + # do nothing on magellan
56 + if [ "$system" = "magellan" ];
57 + then
58 + return
59 + fi
60 +
61 if [ "$system" = "fedora" ] || [ "$system" = "redhat" ] || [ "$system" = "suse" ];
62 then
63 if [ -f "/sbin/chkconfig" ];
64 @@ -3537,6 +3555,12 @@
65
66 addNXinit () {
67
68 + # do nothing on magellan
69 + if [ "$system" = "magellan" ];
70 + then
71 + return
72 + fi
73 +
74 runCommand "cat '$NX_ROOT/scripts/init/nxserver' > /etc/init.d/nxserver" "Unable to create: /etc/init.d/nxserver" "warn"
75 runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of /etc/init.d/nxserver file" "warn"
76
77 @@ -5744,19 +5768,6 @@
78 checkETCDirectory
79 makeNXConfig
80
81 - checkNxhtdUserExist
82 - if [ "x$?" = "x0" ];
83 - then
84 - if [ "$system" != "solaris" ];
85 - then
86 - addNxhtdUserLinux
87 - else
88 - addNxhtdUserSolaris
89 - fi
90 - else
91 - printMsg "User 'nxhtd' already exists" "onlylog"
92 - fi
93 -
94 setShell
95 genNXUsersKeys
96 makeNXConfigServer
97 @@ -6751,6 +6762,12 @@
98
99 addNxhtdUserLinux () {
100
101 + # simply abort if the user exist. on magellan this user is already created.
102 + if id nxhtd > /dev/null 2>&1
103 + then
104 + return
105 + fi
106 +
107 checkNxhtdGroupExist
108 if [ "x$?" = "x0" ];
109 then