[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-261-ga0a8126

[X2Go dev team]

The branch, build-baikal has been updated
       via  a0a8126b3e594c84a6443d4e1839a6b73249315c (commit)
      from  61c2bd151f27d0c3bd3bfb840d6c67a934aa203e (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog           |    1 +
 debian/x2goserver.postinst |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8221a7d..3aebfcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Rename example user and group for session limits in x2goserver.conf so that
     people do not get the idea to put users in x2gouser group.
   * Makefile and man page area fix for x2goserver-extensions.
+  * x2goserver.postinst: fix home path updates if new home path already exists
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 407cf79..24515db 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -46,6 +46,9 @@ case "$1" in
 			# make sure all settings are appropriate
 			if [ "`id -gn x2gouser`" != "x2gouser" ]; then
 				usermod --gid x2gouser x2gouser
+				test -d /var/lib/x2go && \
+					usermod --home /var/lib/x2go x2gouser || \
+					usermod --move-home --home /var/lib/x2go x2gouser
 			fi
 			if [ "`ls -1d ~x2gouser`" != "/var/lib/x2go" ]; then
 				usermod --move-home --home /var/lib/x2go x2gouser
@@ -110,7 +113,9 @@ case "$1" in
 				usermod --gid x2goprint# x2goprint
 			fi
 			if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then
-				usermod --move-home --home /var/spool/x2goprint x2goprint
+				test -d /var/spool/x2goprint && \
+					usermod --home /var/spool/x2goprint x2goprint || \
+					usermod --move-home --home /var/spool/x2goprint x2goprint
 			fi
 			# we leave user shell alone. we have never set this wrongly
 			# and we need to respect the administrator's choices


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).