diff options
| author | Dirk von Suchodoletz | 2008-04-10 16:02:31 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-04-10 16:02:31 +0200 |
| commit | 8697dffdb76bae48419833f9b68e812b47cd1ff7 (patch) | |
| tree | 8d4aa5f6327f84716e2addd0394a85e5b36c89d9 /os-plugins/plugins | |
| parent | * corrected minor formatting glitch in POD (diff) | |
| download | core-8697dffdb76bae48419833f9b68e812b47cd1ff7.tar.gz core-8697dffdb76bae48419833f9b68e812b47cd1ff7.tar.xz core-8697dffdb76bae48419833f9b68e812b47cd1ff7.zip | |
Checkin of vmchooser plugin fixes (installation) on behalf of bw21 ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1736 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins')
| -rw-r--r-- | os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm | 11 | ||||
| -rw-r--r-- | os-plugins/plugins/vmchooser/XX_vmchooser.sh | 23 |
2 files changed, 22 insertions, 12 deletions
diff --git a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm index 2a4484d8..48ecaade 100644 --- a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm +++ b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm @@ -51,8 +51,8 @@ sub getAttrInfo return { 'vmchooser::active' => { - applies_to_systems => 0, - applies_to_clients => 0, + applies_to_systems => 1, + applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), should the 'vmchooser'-plugin be executed during boot? End-of-Here @@ -82,8 +82,8 @@ sub installationPhase # the openslx base path bind-mounted into the chroot (/mnt/openslx) # for this example plugin, we simply create two files: - spitFile("$pluginRepositoryPath/right", "(-;\n"); - spitFile("$pluginRepositoryPath/left", ";-)\n"); + #spitFile("$pluginRepositoryPath/right", "(-;\n"); + #spitFile("$pluginRepositoryPath/left", ";-)\n"); # Some plugins have to copy files from their plugin folder into the # vendor-OS. In order to make this possible while chrooted, the host's @@ -96,9 +96,10 @@ sub installationPhase # get our own base path: - my $pluginBasePath = "/mnt/openslx/lib/plugins/$pluginName"; + my $pluginBasePath = "/mnt/openslx/lib/plugins/$pluginName/files"; # copy all needed files now: + system( "bash") ; foreach my $file ( qw( vmchooser ) ) { copyFile("$pluginBasePath/$file", "$pluginRepositoryPath/"); } diff --git a/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/os-plugins/plugins/vmchooser/XX_vmchooser.sh index 0f9521b8..037a857c 100644 --- a/os-plugins/plugins/vmchooser/XX_vmchooser.sh +++ b/os-plugins/plugins/vmchooser/XX_vmchooser.sh @@ -4,12 +4,21 @@ CONFFILE="/initramfs/plugin-conf/vmchooser.conf" if [ -e $CONFFILE ]; then . $CONFFILE if [ $vmchooser_active -ne 0 ]; then - [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'example' os-plugin ..."; + [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'vmchooser' os-plugin ..."; + [ $DEBUGLEVEL -gt 0 ] && echo "creating default session entry ..."; + echo '[Desktop Entry] + Encoding=UTF-8 + Name=VMCHOOSER + Name[de]=VMCHOOSER + 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= + Type=Application' >> /mnt/etc/X11/sessions/default.desktop - # for this example plugin, we simply take a filename from the - # configuration and cat that file (output the smiley): - cat /mnt/opt/openslx/plugin-repo/example/$preferred_side - - [ $DEBUGLEVEL -gt 0 ] && echo "done with 'example' os-plugin ..."; + + + [ $DEBUGLEVEL -gt 0 ] && echo "done with 'vmchooser' os-plugin ..."; fi -fi
\ No newline at end of file +fi |