summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm7
-rw-r--r--os-plugins/plugins/virtualbox/XX_virtualbox.sh3
-rwxr-xr-xtools/uclibc-wrapper3
3 files changed, 9 insertions, 4 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
diff --git a/tools/uclibc-wrapper b/tools/uclibc-wrapper
index 82f55656..08934f32 100755
--- a/tools/uclibc-wrapper
+++ b/tools/uclibc-wrapper
@@ -19,7 +19,8 @@ else
echo "Can't find OpenSLX Environment." && exit 1
fi
-[ -f /lib/ld-uClibc.so.0 ] && ln -sf $SLX_PATH/uclib-rootfs/lib/ld-uClibc.so.0
+[ -f /lib/ld-uClibc.so.0 ] || \
+ ln -sf $SLX_PATH/uclib-rootfs/lib/ld-uClibc.so.0 /lib/ld-uClibc.so.0
PATH=$SLX_UCLIB_PATH/bin:$SLX_UCLIB_PATH/usr/bin:$SLX_UCLIB_PATH/sbin:\
$SLX_UCLIB_PATH/usr/sbin