From 90f06a5d9c32ab014a2fa79988fd8cac366ff69f Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 1 Jun 2015 15:33:30 +0200
Subject: [pvs2] don't start pvsclient if we are running the pvsmgr session

---
 .../pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient       | 2 ++
 remote/modules/pvs2/data/opt/openslx/xsessions/pvs2mgr.desktop        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
index 7b28889d..f79b4997 100755
--- a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
+++ b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
@@ -1,5 +1,7 @@
 #!/bin/ash
 
+# do not start pvsclient if we are running the pvs manager session
+[ "x${SESSION_NAME}" == "xPVS-Manager" ] && exit 0
 # If the ENV var PVS has been set by vmchooser start pvsclient
 if [ -n "$PVS_AUTO_CONNECT" -a "$PVS_AUTO_CONNECT" == "TRUE" ]; then
   pvsclient --auto &
diff --git a/remote/modules/pvs2/data/opt/openslx/xsessions/pvs2mgr.desktop b/remote/modules/pvs2/data/opt/openslx/xsessions/pvs2mgr.desktop
index dbe80eb3..219f9417 100755
--- a/remote/modules/pvs2/data/opt/openslx/xsessions/pvs2mgr.desktop
+++ b/remote/modules/pvs2/data/opt/openslx/xsessions/pvs2mgr.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=PVS Steuerkonsole
-Name[de]=PVS Steuerkonsole
+Name=PVS-Manager
+Name[de]=PVS-Manager
 Exec=/opt/openslx/scripts/setup-pvsmgr
 TryExec=/opt/openslx/bin/pvsmgr
 Icon=
-- 
cgit v1.2.3-55-g7522