[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-108-gee1805d

[X2go dev team]

The branch, master has been updated
       via  ee1805d8502441f57561c573308e85fdb7482dd2 (commit)
       via  5269c53c363e1400cb71ac4f94949bd2c8386cc2 (commit)
      from  45e77b2f85558fe91e0e0bb59d92eb27224cf9b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ee1805d8502441f57561c573308e85fdb7482dd2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 18 23:26:07 2011 +0200

    syntax fix for usermod used in x2goserver.postinst

commit 5269c53c363e1400cb71ac4f94949bd2c8386cc2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 18 23:25:43 2011 +0200

    line lenght fix for changelog

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog           |    4 ++--
 debian/x2goserver.postinst |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 455387c..7b754d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     from perlsuid.
   * Use source format 3.0 (native).
   * Fix of Debian clean rules, fix of Makefile's clean rules.
-  * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead of
-    Conflicts).
+  * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint
+    (instead of Conflicts).
   * Switch to setgid instead of setuid for SQLite wrapper.
   * Tab'ified postinst/postrm scripts.
 
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 06f153b..7704c83 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -39,9 +39,10 @@ case "$1" in
 		else
 			echo "User x2gouser already exists." >&2
 			# make sure all settings are appropriate
-			id -g --name "x2gouser" | grep "x2gousers" >/dev/null && usermod x2gouser --gid x2gouser
-			usermod x2gouser --home /var/db/x2go
-			usermod x2gouser --shell /bin/false
+			id -g --name "x2gouser" | grep "x2gousers" >/dev/null && usermod --gid x2gouser x2gouser
+			mkdir -p /var/db/x2go
+			usermod --home /var/db/x2go x2gouser
+			usermod --shell /bin/false x2gouser
 		fi
 
 		if [ ! -f /var/db/x2go/x2go_sessions ]; then


hooks/post-receive
-- 
x2goserver.git (X2go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2go Server).