diff options
Diffstat (limited to 'net/freenx/files/patch-freenx-nxnode')
| -rw-r--r-- | net/freenx/files/patch-freenx-nxnode | 52 |
1 files changed, 11 insertions, 41 deletions
diff --git a/net/freenx/files/patch-freenx-nxnode b/net/freenx/files/patch-freenx-nxnode index 6fd627be0c33..1156eaf49bde 100644 --- a/net/freenx/files/patch-freenx-nxnode +++ b/net/freenx/files/patch-freenx-nxnode @@ -1,43 +1,21 @@ ---- freenx-0.3.1/nxnode.orig Sat Mar 12 12:57:35 2005 -+++ freenx-0.3.1/nxnode Mon Mar 28 12:10:41 2005 +--- freenx-0.4.1/nxnode.orig Thu Jun 23 11:42:52 2005 ++++ freenx-0.4.1/nxnode Tue Jun 28 09:38:40 2005 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash # Free implementation of nxserver components # -@@ -198,7 +198,7 @@ - P="" - [ -n "$agent_user" ] && U="-u $agent_user" - [ -n "$agent_password" ] && P="-p -" -- echo "$agent_password" | $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $U $P $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>>~/.nx/C-$sess_id/session & -+ echo "$agent_password" | LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $U $P $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>>~/.nx/C-$sess_id/session & - else +@@ -42,7 +42,7 @@ + # Reread boot command line; echo last parameter's argument or return false. + getparam(){ + stringinstring "&$1=" "$CMDLINE" || return 1 +-echo "$CMDLINE" | awk "/^$1=/"' { VAL=$2 } END { print VAL }' FS="=" RS="(&|\n)" ++echo "$CMDLINE" | tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }' + return 0 + } - # nxviewer session -@@ -206,17 +206,17 @@ - if [ "$type" = "vnc" ] - then - mkdir -p ~/.nx/C-$sess_id/scripts/ -- echo "$agent_password" | $PATH_BIN/nxpasswd ~/.nx/C-$sess_id/scripts/.passwd doit -- $PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd ~/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>>~/.nx/C-$sess_id/session & -+ echo "$agent_password" | LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxpasswd ~/.nx/C-$sess_id/scripts/.passwd doit -+ LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd ~/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>>~/.nx/C-$sess_id/session & - else - # "normal" nxagent session - if [ -n "$R" -a "$ENABLE_ROOTLESS_MODE" != "1" ] - then - # nxproxy single application mode session -- $PATH_BIN/nxproxy -C :$display $PROXY_EXTRA_OPTIONS 2>>~/.nx/C-$sess_id/session & -+ LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxproxy -C :$display $PROXY_EXTRA_OPTIONS 2>>~/.nx/C-$sess_id/session & - else - # nxagent session -- $PATH_BIN/nxagent -persistent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $B :$display $AGENT_EXTRA_OPTIONS_X 2>>~/.nx/C-$sess_id/session & -+ LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxagent -persistent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $B :$display $AGENT_EXTRA_OPTIONS_X 2>>~/.nx/C-$sess_id/session & - fi - fi - fi -@@ -460,7 +460,7 @@ +@@ -621,7 +621,7 @@ # TODO: imagecompressionmethod ... [ "$imagecompressionmethod" = "0" ] && PACK="pack=nopack," @@ -46,12 +24,4 @@ # write options file [ -z "$samba" ] && samba=0 -@@ -573,7 +573,7 @@ - $COMMAND_SMBMOUNT //$computername/$rdir $HOME/$dir -o username $username ip 127.0.0.1 port $port - if [ $? -eq 0 ] - then -- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display -+ LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display - fi - } |