From 99c3ba4abeb431eb5108b844dd49fc45df3fd6fc Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 12 Aug 2009 13:08:16 +0000
Subject: Small fixes/hints in plugins.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3083 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm | 4 ++--
 os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
index c40c3f24..68875450 100644
--- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
+++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
@@ -130,11 +130,11 @@ sub installationPhase
     my $do_stop = unshiftHereDoc(<<'    End-of-Here');
         /opt/openslx/plugin-repo/bootsplash/bin/splashy shutdown 
         sleep 1
-        /opt/openslx/plugin-repo/bootsplash/bin/splashy_update \
+        uclibc-wrapper /opt/openslx/plugin-repo/bootsplash/bin/splashy_update \
           "progress 100" 2>/dev/null
     End-of-Here
    
-    # add helper function to initfile
+    # add helper functions to initfile
     # first parameter name of the function
     # second parameter content of the function
     $initFile->addFunction('do_start', "  : # do nothing here");
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
index 3fd15bfb..b6749747 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
@@ -210,9 +210,11 @@ sub _writeRunlevelScript
         'stop && start'
     );
         
-     # get distro version (does not work)
-     my $workaround_distro = qx(lsb_release -si);
+     # get distro version (does not work and makes no sense to call an external
+     # function which is not available in all distros)
+     # my $workaround_distro = qx(lsb_release -si);
      # alternative from bootsplash.pm
+     my $workaround_distro = (split('-',$self->{'os-plugin-engine'}->distroName()))[0];
      my $runlevelscript = getInitFileForDistro($initfile, $workaround_distro);
 
      $workaround .=  $runlevelscript;
-- 
cgit v1.2.3-55-g7522