summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm2
-rw-r--r--os-plugins/plugins/vmchooser/XX_vmchooser.sh22
-rwxr-xr-xos-plugins/plugins/vmchooser/files/printer.sh10
-rwxr-xr-xos-plugins/plugins/vmchooser/files/scanner.sh4
-rw-r--r--os-plugins/plugins/vmchooser/files/vmchooserbin632272 -> 587232 bytes
-rwxr-xr-xos-plugins/plugins/vmware/files/Vorlage_VMwareImageAdministrator.xml6
6 files changed, 34 insertions, 10 deletions
diff --git a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
index 2db3c315..1158bc85 100644
--- a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
+++ b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
@@ -75,7 +75,7 @@ sub installationPhase
# copy all needed files now:
my $pluginName = $self->{'name'};
my $pluginBasePath = "$openslxBasePath/lib/plugins/$pluginName/files";
- foreach my $file ( qw( vmchooser ) ) {
+ foreach my $file ( qw( vmchooser printer.sh scanner.sh ) ) {
copyFile("$pluginBasePath/$file", "$pluginRepoPath/");
}
diff --git a/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
index 037a857c..fc446f2f 100644
--- a/os-plugins/plugins/vmchooser/XX_vmchooser.sh
+++ b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
@@ -8,17 +8,25 @@ if [ -e $CONFFILE ]; then
[ $DEBUGLEVEL -gt 0 ] && echo "creating default session entry ...";
echo '[Desktop Entry]
Encoding=UTF-8
- Name=VMCHOOSER
- Name[de]=VMCHOOSER
+ 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
- TryExec=/opt/openslx/plugin-repo/vmchooser/vmchooser
- Icon=
+ Exec=/etc/X11/sessions/default.sh
+ TryExec=/etc/X11/sessions/default.sh
+ 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/printer.sh b/os-plugins/plugins/vmchooser/files/printer.sh
new file mode 100755
index 00000000..8f1d5ffa
--- /dev/null
+++ b/os-plugins/plugins/vmchooser/files/printer.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#echo "<printer name=\"info\" path=\"//printserver/info\"> some pseudo printer </printer>"
+
+for(( i=0; $i<10; i=$i+1)); do
+ echo -e "printserver$i\tprinter$i\tPrinter Description $i"
+done
+
+echo -e "printserver.ruf.uni-freiburg.de\treal-printer-name\tSome really long printer Description"
+
diff --git a/os-plugins/plugins/vmchooser/files/scanner.sh b/os-plugins/plugins/vmchooser/files/scanner.sh
new file mode 100755
index 00000000..dcb94c68
--- /dev/null
+++ b/os-plugins/plugins/vmchooser/files/scanner.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+
+echo -e "scanserver\tscanner1hp\tThis is a test Scanner"
diff --git a/os-plugins/plugins/vmchooser/files/vmchooser b/os-plugins/plugins/vmchooser/files/vmchooser
index 156cf67f..91252b5f 100644
--- a/os-plugins/plugins/vmchooser/files/vmchooser
+++ b/os-plugins/plugins/vmchooser/files/vmchooser
Binary files differ
diff --git a/os-plugins/plugins/vmware/files/Vorlage_VMwareImageAdministrator.xml b/os-plugins/plugins/vmware/files/Vorlage_VMwareImageAdministrator.xml
index 3d0d18bc..75269ae0 100755
--- a/os-plugins/plugins/vmware/files/Vorlage_VMwareImageAdministrator.xml
+++ b/os-plugins/plugins/vmware/files/Vorlage_VMwareImageAdministrator.xml
@@ -44,11 +44,11 @@
</priority>
#Description: Should printers be connected ? Which ?
<printers param="true">
- <printer name="" path=""></printer>
+ <printer name="" path="">Human readable description</printer>
</printers>
#Description: Should scanners be connected ? Which ?
<scanners>
- <scanner name="" ip=""></scanner>
+ <scanner name="" path="">Description</scanner>
</scanners>
#Description: Should the Homedrive be connected ?
<home param="true">
@@ -57,5 +57,7 @@
<shareds param="true">
<shared name="" path="" pass=""></shared>
</shareds>
+ <locked param="true">
+ </locked>
</eintrag>
</settings>