Magellan Linux

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

    Diff of /trunk/nxserver-freeedition/patches/nxserver-freeedition-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 nxserver/NX/scripts/setup/nxserver nxserver-magellan/NX/scripts/setup/nxserver  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  --- 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  +++ nxserver-magellan/NX/scripts/setup/nxserver 2010-12-23 19:33:03.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 nxserver/NX/scripts/setup/nxs Line 24  diff -Naur nxserver/NX/scripts/setup/nxs
    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 nxserver/NX/scripts/setup/nxs Line 32  diff -Naur nxserver/NX/scripts/setup/nxs
    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 nxserver/NX/scripts/setup/nxs Line 40  diff -Naur nxserver/NX/scripts/setup/nxs
    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
    # Line 47  diff -Naur nxserver/NX/scripts/setup/nxs Line 48  diff -Naur nxserver/NX/scripts/setup/nxs
    48   /etc/immunix-release   /etc/immunix-release
    49   knoppix_version   knoppix_version
    50   /etc/lfs-release   /etc/lfs-release
    51  @@ -3333,6 +3344,12 @@  @@ -3333,6 +3345,12 @@
    52    
    53   removeNXinit () {   removeNXinit () {
    54    
    # Line 60  diff -Naur nxserver/NX/scripts/setup/nxs Line 61  diff -Naur nxserver/NX/scripts/setup/nxs
    61     if [ "$system" = "fedora" ] || [ "$system" = "redhat" ] || [ "$system" = "suse" ];     if [ "$system" = "fedora" ] || [ "$system" = "redhat" ] || [ "$system" = "suse" ];
    62     then     then
    63       if [ -f "/sbin/chkconfig" ];       if [ -f "/sbin/chkconfig" ];
    64  @@ -3537,6 +3554,12 @@  @@ -3537,6 +3555,12 @@
    65    
    66   addNXinit () {   addNXinit () {
    67    
    # Line 73  diff -Naur nxserver/NX/scripts/setup/nxs Line 74  diff -Naur nxserver/NX/scripts/setup/nxs
    74    runCommand "cat '$NX_ROOT/scripts/init/nxserver' > /etc/init.d/nxserver" "Unable to create: /etc/init.d/nxserver" "warn"    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"    runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of /etc/init.d/nxserver file" "warn"
    76    
    77  @@ -6751,6 +6774,12 @@  @@ -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 () {   addNxhtdUserLinux () {
    100    
    Legend:
    Removed from v.1240  
    changed lines
      Added in v.1241