Magellan Linux

Contents of /trunk/nxserver-freenx/patches/nxserver-freenx-0.7.3-nxpath.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1792 - (show annotations) (download)
Mon Jun 4 14:33:04 2012 UTC (11 years, 11 months ago) by niro
File size: 1577 byte(s)
-freenx-0.7.3 patches and files
1 Make nxkeygen and nxsetup work when invoked as symlinks.
2 https://bugzilla.redhat.com/616993
3
4 diff -up freenx-server-0.7.3/nxkeygen.nxpath freenx-server-0.7.3/nxkeygen
5 --- freenx-server-0.7.3/nxkeygen.nxpath 2010-07-21 23:45:11.739315044 +0300
6 +++ freenx-server-0.7.3/nxkeygen 2010-07-21 23:47:15.171315008 +0300
7 @@ -16,7 +16,7 @@
8 # ========================================================================
9
10 # Read the config file
11 -. $(PATH=$(cd $(dirname $0) && pwd):$PATH which nxloadconfig) --
12 +. $(PATH=$(dirname $(readlink -f $(type -P $0 || echo $0))):$PATH which nxloadconfig) --
13
14 [ -z "$NX_KEY_DIR" ] && NX_KEY_DIR="$NX_HOME_DIR/.ssh"
15 DATE="`date '+%Y%m%d-%H%M%S'`"
16 diff -up freenx-server-0.7.3/nxsetup.nxpath freenx-server-0.7.3/nxsetup
17 --- freenx-server-0.7.3/nxsetup.nxpath 2008-03-11 01:01:03.000000000 +0200
18 +++ freenx-server-0.7.3/nxsetup 2010-07-21 23:47:25.699318736 +0300
19 @@ -137,7 +137,7 @@ parse_cmdline()
20 parse_cmdline "$@"
21
22 # Read the config file
23 -. $(PATH=$(cd $(dirname $0) && pwd):$PATH which nxloadconfig) --
24 +. $(PATH=$(dirname $(readlink -f $(type -P $0 || echo $0))):$PATH which nxloadconfig) --
25
26 run_nscd()
27 {
28 @@ -380,7 +380,7 @@ test_nx()
29 echo ""
30 echo "----> Testing your nxserver configuration ..."
31 [ "$IGNORE_ERRORS" = "yes" ] && NO_ERRORS="--ignore-errors"
32 - . $(PATH=$(cd $(dirname $0) && pwd):$PATH which nxloadconfig) --check $NO_ERRORS
33 + . $(PATH=$(dirname $(readlink -f $(type -P $0 || echo $0))):$PATH which nxloadconfig) --check $NO_ERRORS
34 echo "<---- done"
35 echo ""
36 echo "----> Testing your nxserver connection ..."