Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

10 files changed, 2 insertions, 2 deletions

diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx-left.png
index 900dd867..900dd867 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-left.png
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx-left.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx-right.png
index 8ca9347b..8ca9347b 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx-right.png
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx-right.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx.ini
index 57a22821..57a22821 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/openslx/openslx.ini
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx.ini
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets-left.png
index c8736b72..c8736b72 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-left.png
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets-left.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets-right.png
index e21f0d8b..e21f0d8b 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets-right.png
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets-right.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets.ini
index d9aa17f6..d9aa17f6 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/planets/planets.ini
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets.ini
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_l.png
index e602ccd1..e602ccd1 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_l.png
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_l.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_r.png
index 3edbcb0c..3edbcb0c 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/title_r.png
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_r.png
diff --git a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/unifr.ini
index dadcb4e1..dadcb4e1 100644
--- a/remote/modules/vmchooser/data/usr/share/vmchooser/themes/unifr/unifr.ini
+++ b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/unifr.ini
diff --git a/remote/modules/vmchooser/data/usr/share/xsessions/default.desktop b/remote/modules/vmchooser/data/usr/share/xsessions/default.desktop
index c6a0f825..48812a8e 100755
--- a/remote/modules/vmchooser/data/usr/share/xsessions/default.desktop
+++ b/remote/modules/vmchooser/data/usr/share/xsessions/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=/openslx/bin/vmchooser
-TryExec=/openslx/bin/vmchooser
+Exec=/opt/openslx/vmchooser/bin/vmchooser -c /etc/openslx/vmchooser/vmchooser.conf
+TryExec=/opt/openslx/vmchooser/bin/vmchooser -c /etc/openslx/vmchooser/vmchooser.conf
 Icon=
 Type=Application