Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/nxclient/patches/nxclient-4.0.0_pre1-magellan.patch

    Diff of /trunk/nxclient/patches/nxclient-4.0.0_pre1-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1240 by niro, Thu Dec 23 17:21:35 2010 UTC revision 1241 by niro, Thu Dec 23 18:32:39 2010 UTC
    # Line 1  Line 1 
    1  diff -Naur nxclient/NX/scripts/setup/nxclient nxclient-magellan/NX/scripts/setup/nxclient  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  --- nxclient/NX/scripts/setup/nxclient 2010-12-21 13:49:23.000000000 +0100
    3  +++ nxclient-magellan/NX/scripts/setup/nxclient 2010-12-23 18:23:26.000000000 +0100  +++ nxclient-magellan/NX/scripts/setup/nxclient 2010-12-23 18:59:45.000000000 +0100
    4  @@ -98,6 +98,11 @@  @@ -98,6 +98,12 @@
    5       return 0       return 0
    6     fi     fi
    7    
    8  +  if [ -f /etc/mageversion ];  +  if [ -f /etc/mageversion ];
    9  +  then  +  then
    10  +    system=magellan  +    system=magellan
    11    +    return 0
    12  +  fi  +  fi
    13  +  +
    14     return 1     return 1
    15   }   }
    16    
    17  @@ -1957,6 +1962,9 @@  @@ -1957,6 +1963,9 @@
    18       elif [ "$system" = "mandrake" ];       elif [ "$system" = "mandrake" ];
    19       then       then
    20         detectedSystem="Mandriva"         detectedSystem="Mandriva"
    # Line 23  diff -Naur nxclient/NX/scripts/setup/nxc Line 24  diff -Naur nxclient/NX/scripts/setup/nxc
    24       fi       fi
    25    
    26       printMsg "Autodetected system: $detectedSystem"       printMsg "Autodetected system: $detectedSystem"
    27  @@ -2171,6 +2179,7 @@  @@ -2171,6 +2180,7 @@
    28     echo "                    Xandros Desktop 4.1/Xandros Server 2.0 etc."     echo "                    Xandros Desktop 4.1/Xandros Server 2.0 etc."
    29     echo "       solaris      Sun Solaris 10.0 etc."     echo "       solaris      Sun Solaris 10.0 etc."
    30     echo "       fedora       Fedora 10/11/12/13 etc."     echo "       fedora       Fedora 10/11/12/13 etc."
    # Line 31  diff -Naur nxclient/NX/scripts/setup/nxc Line 32  diff -Naur nxclient/NX/scripts/setup/nxc
    32    
    33     echo "$errMsg"     echo "$errMsg"
    34    
    35  @@ -2309,6 +2318,7 @@  @@ -2309,6 +2319,7 @@
    36         "debian"             ) ;;         "debian"             ) ;;
    37         "solaris"            ) ;;         "solaris"            ) ;;
    38         "macosx"             ) ;;         "macosx"             ) ;;
    # Line 39  diff -Naur nxclient/NX/scripts/setup/nxc Line 40  diff -Naur nxclient/NX/scripts/setup/nxc
    40         ""                   ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;         ""                   ) 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'" ;;         *                    ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
    42       esac       esac
    43  @@ -2447,6 +2457,7 @@  @@ -2447,6 +2458,7 @@
    44   /etc/debian_release   /etc/debian_release
    45   /etc/fedora-release   /etc/fedora-release
    46   /etc/gentoo-release   /etc/gentoo-release
    Legend:
    Removed from v.1240  
    changed lines
      Added in v.1241