summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-08-12 11:02:22 +0200
committerDirk von Suchodoletz2009-08-12 11:02:22 +0200
commit63b18422c4d65b7988e39d2976a56679dcba530c (patch)
tree990a51c391abb1099a309b670f16e0d9c8e64e31 /os-plugins/plugins
parentdistroutils demo code (diff)
downloadcore-63b18422c4d65b7988e39d2976a56679dcba530c.tar.gz
core-63b18422c4d65b7988e39d2976a56679dcba530c.tar.xz
core-63b18422c4d65b7988e39d2976a56679dcba530c.zip
Small fixes ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3080 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins')
-rw-r--r--os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm3
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm3
2 files changed, 4 insertions, 2 deletions
diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
index db18f1a4..c370267a 100644
--- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
+++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm
@@ -127,7 +127,7 @@ sub installationPhase
my $pluginRepoPath = "$self->{pluginRepositoryPath}";
my $initFile = newInitFile();
- my $do_stop = unshiftHereDoc(<<" End-of-Here");
+ 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 \\
@@ -137,6 +137,7 @@ sub installationPhase
# add helper function to initfile
# first parameter name of the function
# second parameter content of the function
+ $initFile->addFunction('do_start', '# do nothing here');
$initFile->addFunction('do_stop', $do_stop);
# place a call of the helper function in the stop block
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
index e9400c55..3fd15bfb 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
@@ -210,8 +210,9 @@ sub _writeRunlevelScript
'stop && start'
);
- # get distro version
+ # get distro version (does not work)
my $workaround_distro = qx(lsb_release -si);
+ # alternative from bootsplash.pm
my $runlevelscript = getInitFileForDistro($initfile, $workaround_distro);
$workaround .= $runlevelscript;