summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorBastian Wissler2008-06-05 15:43:29 +0200
committerBastian Wissler2008-06-05 15:43:29 +0200
commit295c3466cfd902c2e75246b995d33078a942460b (patch)
tree76fc350a2f39151fcc93d808d120df5c9df90190 /os-plugins
parentVMChooser-Version mit XML+Info als erster Parameter fÃŒr run-vmware.sh (diff)
downloadcore-295c3466cfd902c2e75246b995d33078a942460b.tar.gz
core-295c3466cfd902c2e75246b995d33078a942460b.tar.xz
core-295c3466cfd902c2e75246b995d33078a942460b.zip
BugFix
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1844 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm1
-rw-r--r--os-plugins/plugins/vmchooser/XX_vmchooser.sh14
-rw-r--r--os-plugins/plugins/vmchooser/files/vmchooserbin587232 -> 2314128 bytes
3 files changed, 3 insertions, 12 deletions
diff --git a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
index 1158bc85..c889d60d 100644
--- a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
+++ b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
@@ -77,6 +77,7 @@ sub installationPhase
my $pluginBasePath = "$openslxBasePath/lib/plugins/$pluginName/files";
foreach my $file ( qw( vmchooser printer.sh scanner.sh ) ) {
copyFile("$pluginBasePath/$file", "$pluginRepoPath/");
+ chmod 0755, "$pluginRepoPath/$file";
}
return;
diff --git a/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
index fc446f2f..e5842171 100644
--- a/os-plugins/plugins/vmchooser/XX_vmchooser.sh
+++ b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
@@ -12,21 +12,11 @@ if [ -e $CONFFILE ]; then
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=/etc/X11/sessions/default.sh
- TryExec=/etc/X11/sessions/default.sh
+ Exec=/opt/openslx/plugin-repo/vmchooser/vmchooser -s /etc/X11/sessions/
+ TryExec=/opt/openslx/plugin-repo/vmchooser/vmchooser -s /etc/X11/sessions/
Icon=
Type=Application' >> /mnt/etc/X11/sessions/default.desktop
-
- [ $DEBUGLEVEL -gt 0 ] && echo "creating wrapper script ...";
- echo '#!/bin/bash
- # This script was created from XX_vmchooser.sh
- # and is a wrapper script for the vmchooser program
- /opt/openslx/plugin-repo/vmchooser/vmchooser -s /etc/X11/sessions/
- /etc/X11/sessions/session.sh &
- ' >> /mnt/etc/X11/sessions/default.sh
- chmod +x /mnt/etc/X11/sessions/default.sh
-
[ $DEBUGLEVEL -gt 0 ] && echo "done with 'vmchooser' os-plugin ...";
fi
fi
diff --git a/os-plugins/plugins/vmchooser/files/vmchooser b/os-plugins/plugins/vmchooser/files/vmchooser
index 91252b5f..88fe0b8e 100644
--- a/os-plugins/plugins/vmchooser/files/vmchooser
+++ b/os-plugins/plugins/vmchooser/files/vmchooser
Binary files differ