diff options
| author | Dirk von Suchodoletz | 2009-08-13 17:31:46 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-08-13 17:31:46 +0200 |
| commit | d1e3e42c546d70eb89b4ff5f8585e12b2d7122af (patch) | |
| tree | 04ad9aba04919c80a23a58f671eb95fad515dcde | |
| parent | Hopefully fixing the #481 bug (please report). (diff) | |
| download | core-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
| -rw-r--r-- | os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm | 7 | ||||
| -rw-r--r-- | os-plugins/plugins/virtualbox/XX_virtualbox.sh | 3 | ||||
| -rwxr-xr-x | tools/uclibc-wrapper | 3 |
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 |