summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-08-13 17:31:46 +0200
committerDirk von Suchodoletz2009-08-13 17:31:46 +0200
commitd1e3e42c546d70eb89b4ff5f8585e12b2d7122af (patch)
tree04ad9aba04919c80a23a58f671eb95fad515dcde /os-plugins
parentHopefully fixing the #481 bug (please report). (diff)
downloadcore-d1e3e42c546d70eb89b4ff5f8585e12b2d7122af.tar.gz
core-d1e3e42c546d70eb89b4ff5f8585e12b2d7122af.tar.xz
core-d1e3e42c546d70eb89b4ff5f8585e12b2d7122af.zip
Trivial fixes to virtualbox plugin and uclibc-wrapper ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3088 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm7
-rw-r--r--os-plugins/plugins/virtualbox/XX_virtualbox.sh3
2 files changed, 7 insertions, 3 deletions
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
index b6749747..a70d5f3d 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm
@@ -187,12 +187,15 @@ sub _writeRunlevelScript
# 'start',
# 'modprobe vboxdrv && modprobe vboxnetflt',
#);
- $workaround .= "start() { modprobe vboxdrv && modprobe vboxnetflt }\n";
+ # why to load the modules already loaded in stage3??
+ $workaround .= "start() { modprobe vboxdrv && modprobe vboxnetflt; }\n";
#$initfile->addScript(
# 'stop',
# 'rmmod vboxnetflt && rmmod vboxdrv',
#);
- $workaround .= "stop() { rmmod vboxnetflt && rmmod vboxdrv }\n";
+ $workaround .= "stop() { rmmod vboxnetflt && rmmod vboxdrv; }\n";
+
+ # please check for the new type of runlevel script writing (r3079)
$initfile->addToCase(
'start',
'start'
diff --git a/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/os-plugins/plugins/virtualbox/XX_virtualbox.sh
index 36158bdb..28505fdb 100644
--- a/os-plugins/plugins/virtualbox/XX_virtualbox.sh
+++ b/os-plugins/plugins/virtualbox/XX_virtualbox.sh
@@ -49,9 +49,10 @@ ${virtualbox_imagesrc}." nonfatal
# copy and activate init file
cp /mnt/opt/openslx/plugin-repo/virtualbox/vbox-slx \
/mnt/etc/init.d
- chmod 755 /etc/init.d/vbox-slx
+ chmod 755 /mnt/etc/init.d/vbox-slx
rllinker "vbox-slx" 20 2
+ # loading of the required kernel modules
modprobe vboxdrv
modprobe vboxnetflt
mknod -m 0660 /dev/vboxdrv c 10 59