summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins/vmchooser/files
diff options
context:
space:
mode:
authorBastian Wissler2009-06-17 15:19:25 +0200
committerBastian Wissler2009-06-17 15:19:25 +0200
commit87c90a67a367bf11e8a8aa4ffffbf245d15a78a1 (patch)
tree5f3875751b1d7b0a606791f552ff819daced7d6a /os-plugins/plugins/vmchooser/files
parentfixed a wrong package-name in xserver::OpenSLX::OSPlugin::Debian (diff)
downloadcore-87c90a67a367bf11e8a8aa4ffffbf245d15a78a1.tar.gz
core-87c90a67a367bf11e8a8aa4ffffbf245d15a78a1.tar.xz
core-87c90a67a367bf11e8a8aa4ffffbf245d15a78a1.zip
vmchooser various changes:
* changed default.desktop to call the binary * deleted vmchooser.sh (not needed any more, as vmchooser binary reads from stage3 variables) -> see Feature #429 * added distro specific classes to copy default.desktop distro specific ;-) - Feature #268 git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2962 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmchooser/files')
-rw-r--r--os-plugins/plugins/vmchooser/files/default.desktop4
-rw-r--r--os-plugins/plugins/vmchooser/files/vmchooser.sh25
2 files changed, 2 insertions, 27 deletions
diff --git a/os-plugins/plugins/vmchooser/files/default.desktop b/os-plugins/plugins/vmchooser/files/default.desktop
index bff6a820..91540228 100644
--- a/os-plugins/plugins/vmchooser/files/default.desktop
+++ b/os-plugins/plugins/vmchooser/files/default.desktop
@@ -4,7 +4,7 @@ Name=virtual machine chooser (default)
Name[de]=Virtuelle Maschine auswählen
Comment=This session starts the vm session chooser
Comment[de]=Diese Sitzung startet das Auswahlmenü für die vorhandenen Sitzungen
-Exec=/opt/openslx/plugin-repo/vmchooser/vmchooser.sh
-TryExec=/opt/openslx/plugin-repo/vmchooser/vmchooser.sh
+Exec=/opt/openslx/plugin-repo/vmchooser/vmchooser
+TryExec=/opt/openslx/plugin-repo/vmchooser/vmchooser
Icon=
Type=Application
diff --git a/os-plugins/plugins/vmchooser/files/vmchooser.sh b/os-plugins/plugins/vmchooser/files/vmchooser.sh
deleted file mode 100644
index 8a47f9e2..00000000
--- a/os-plugins/plugins/vmchooser/files/vmchooser.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# -----------------------------------------------------------------------------
-# Copyright (c) 2007..2009 - RZ Uni FR
-# Copyright (c) 2007..2009 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your suggestions, praise, or complaints to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org/
-# -----------------------------------------------------------------------------
-# vmchooser.sh
-# - This is a generic wrapper script for the vmchooser tool. If you would
-# like to apply any filters for the sessions to be shown to the logged in
-# user, you could use a different path to the sessions *.xml's ...
-# -----------------------------------------------------------------------------
-
-if [ -e "/etc/opt/openslx/vmchooser-stage3.conf" ]; then
- . /etc/opt/openslx/vmchooser-stage3.conf
-fi
-
-/opt/openslx/plugin-repo/vmchooser/vmchooser -p${vmchooser_xmlpath}
-