Annotation of /trunk/nxclient/patches/nxclient-4.0.0_pre1-magellan.patch
Parent Directory | Revision Log
Revision 1241 -
(hide annotations)
(download)
Thu Dec 23 18:32:39 2010 UTC (13 years, 9 months ago) by niro
File size: 1516 byte(s)
Thu Dec 23 18:32:39 2010 UTC (13 years, 9 months ago) by niro
File size: 1516 byte(s)
fixed patches
1 | niro | 1240 | diff -Naur nxclient/NX/scripts/setup/nxclient nxclient-magellan/NX/scripts/setup/nxclient |
2 | --- nxclient/NX/scripts/setup/nxclient 2010-12-21 13:49:23.000000000 +0100 | ||
3 | niro | 1241 | +++ nxclient-magellan/NX/scripts/setup/nxclient 2010-12-23 18:59:45.000000000 +0100 |
4 | @@ -98,6 +98,12 @@ | ||
5 | niro | 1240 | return 0 |
6 | fi | ||
7 | |||
8 | + if [ -f /etc/mageversion ]; | ||
9 | + then | ||
10 | + system=magellan | ||
11 | niro | 1241 | + return 0 |
12 | niro | 1240 | + fi |
13 | + | ||
14 | return 1 | ||
15 | } | ||
16 | |||
17 | niro | 1241 | @@ -1957,6 +1963,9 @@ |
18 | niro | 1240 | 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 | niro | 1241 | @@ -2171,6 +2180,7 @@ |
28 | niro | 1240 | 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 | niro | 1241 | @@ -2309,6 +2319,7 @@ |
36 | niro | 1240 | "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 | niro | 1241 | @@ -2447,6 +2458,7 @@ |
44 | niro | 1240 | /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 |