[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-306-gfca9c15

[X2Go dev team]

The branch, master has been updated
       via  fca9c1538dc3c9a45535bf3dc36727e25dc3d9ea (commit)
      from  0c7b1354b643a7bf4f63213e1d5996f58adb5f91 (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 fca9c1538dc3c9a45535bf3dc36727e25dc3d9ea
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 17 17:28:54 2013 +0100

    Make sure X2Go Server (x2gocleansessions) starts after installation.

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

Summary of changes:
 debian/changelog    |    1 +
 rpm/x2goserver.init |   10 +++++-----
 x2goserver.spec     |    1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fc3600e..3aa141d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,7 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
       PostgreSQL is used as session DB backend).
     + Make sure x2goserver-*.features files do not get installed
       multiple times into various packages.
+    + Make sure X2Go Server (x2gocleansessions) starts after installation.
 
   [ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
   * New upstream version (4.1.0.0):
diff --git a/rpm/x2goserver.init b/rpm/x2goserver.init
index f02a401..a2e6619 100644
--- a/rpm/x2goserver.init
+++ b/rpm/x2goserver.init
@@ -19,13 +19,13 @@
 . /etc/rc.d/init.d/functions
 
 exec=/usr/sbin/x2gocleansessions
-prog="x2gocleansessions"
-config=/etc/sysconfig/x2gocleansessions
+prog="X2Go Server"
+config=/etc/sysconfig/x2goserver
 XSOCKDIR=/tmp/.X11-unix
 
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+[ -e $config ] && . $config
 
-lockfile=/var/lock/subsys/$prog
+lockfile=/var/lock/subsys/x2goserver
 
 start() {
 [ -x $exec ] || exit 5
@@ -65,7 +65,7 @@ force_reload() {
 
 rh_status() {
 	# run checks to determine if the service is running or use generic status
-	status $prog
+	status x2goserver
 }
 
 rh_status_q() {
diff --git a/x2goserver.spec b/x2goserver.spec
index 62291d4..f792926 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -320,6 +320,7 @@ exit 0
 %systemd_postun x2goserver.service
 %else
 /sbin/chkconfig --add x2goserver
+/sbin/service x2goserver condrestart >/dev/null 2>&1 || :
 
 %postun
 if [ "$1" -ge "1" ] ; 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).