summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'os-plugins/plugins')
-rw-r--r--os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm4
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm6
2 files changed, 6 insertions, 4 deletions
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;