diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2008-04-10 10:24:15 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2008-04-10 10:24:15 +0000 |
| commit | 1fd9f280cc9acad4b31f518e75c4814ba6e4f5b6 (patch) | |
| tree | cd902e8b9bb0f58d47bb7e933a2b401d21c9bd50 /net/freenx/files/patch-freenx-nxsetup | |
| parent | - update to 2.1.0 (diff) | |
- update to 2.1.0
PR: 113423
Obtained from: http://www.deweyonline.com/nx/freebsd.html
Notes
Notes:
svn path=/head/; revision=211001
Diffstat (limited to 'net/freenx/files/patch-freenx-nxsetup')
| -rw-r--r-- | net/freenx/files/patch-freenx-nxsetup | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/net/freenx/files/patch-freenx-nxsetup b/net/freenx/files/patch-freenx-nxsetup index d3c2b216a4a8..b102358a6244 100644 --- a/net/freenx/files/patch-freenx-nxsetup +++ b/net/freenx/files/patch-freenx-nxsetup @@ -1,24 +1,16 @@ ---- freenx-0.4.4/nxsetup.unported Fri Feb 3 20:52:09 2006 -+++ freenx-0.4.4/nxsetup Fri Dec 30 18:29:50 2005 +--- nxsetup.unported Mon Jan 22 19:22:50 2007 ++++ nxsetup @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash # Coypright (c) 2004-2005 by Fabian Franz <freenx@fabian-franz.de>. # 2005 by Jon Severinsson <jonno@users.berlios.de>. -@@ -96,7 +96,7 @@ - then - egrep "^nx:" /etc/passwd >/dev/null - else -- getent passwd nx >/dev/null -+ cat /etc/passwd |egrep -q "^nx:" >/dev/null - fi - } - -@@ -113,6 +113,16 @@ - USERADD_OPTIONS="--system --home $NX_HOME_DIR --shell $PATH_BIN/nxserver" - [ -n "$SETUP_GID" ] && USERADD_OPTIONS="--gid $SETUP_GID $USERADD_OPTIONS" +@@ -165,7 +165,16 @@ + # adduser needs a valid group to add the user to + ! nx_group_exists && addgroup --system --quiet $GROUPADD_OPTIONS nx adduser $USERADD_OPTIONS nx +- + + # FreeBSD? + elif [ "$(uname)" = "FreeBSD" ] @@ -31,8 +23,8 @@ + # no, its a "normal" useradd else - USERADD_OPTIONS="-d $NX_HOME_DIR -s $PATH_BIN/nxserver" -@@ -142,15 +152,16 @@ + USERADD_OPTIONS="-g nx -d $NX_HOME_DIR -s $PATH_BIN/nxserver" +@@ -198,15 +207,16 @@ install_nx() { set -e @@ -53,7 +45,7 @@ echo "done" fi -@@ -248,13 +259,12 @@ +@@ -319,13 +329,12 @@ cat /etc/ssh/ssh_host_rsa_key.pub >> $NX_HOME_DIR/.ssh/known_hosts fi @@ -72,7 +64,7 @@ echo "done" } -@@ -268,7 +278,7 @@ +@@ -389,7 +398,7 @@ then luserdel nx else |