1
0
forked from jengelh/virtualbox

Accepting request 112419 from home:mseben:branches:Virtualization

update to virtualbox 4.1.10

OBS-URL: https://build.opensuse.org/request/show/112419
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=81
This commit is contained in:
Michal Seben
2012-04-04 04:13:22 +00:00
committed by Git OBS Bridge
parent a056eedb87
commit 6fcc2cd8ec
10 changed files with 76 additions and 63 deletions

View File

@@ -17,8 +17,8 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
+# Short-Description: VirtualBox Linux Additions kernel modules
### END INIT INFO
PATH=$PATH:/bin:/sbin:/usr/sbin
@@ -165,8 +166,6 @@ fi
. /var/lib/VBoxGuestAdditions/config
@@ -169,8 +170,6 @@ fi
dev=/dev/vboxguest
userdev=/dev/vboxuser
@@ -27,7 +27,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
test_for_gcc_and_make()
{
@@ -242,12 +241,6 @@ do_vboxguest_non_udev()
@@ -256,12 +255,6 @@ do_vboxguest_non_udev()
fail "Cannot create device $dev with major $maj and minor $min"
}
fi
@@ -40,7 +40,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
if [ ! -c $userdev ]; then
maj=10
@@ -258,12 +251,6 @@ do_vboxguest_non_udev()
@@ -272,12 +265,6 @@ do_vboxguest_non_udev()
rmmod vboxguest 2>/dev/null
fail "Cannot create device $userdev with major $maj and minor $min"
}
@@ -53,7 +53,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
fi
fi
}
@@ -292,8 +279,7 @@ start()
@@ -308,8 +295,7 @@ start()
do_vboxguest_non_udev;;
esac
@@ -63,7 +63,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
$MODPROBE vboxsf > /dev/null 2>&1 || {
if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
fail_msg
@@ -303,8 +289,7 @@ start()
@@ -319,8 +305,7 @@ start()
fi
fail "modprobe vboxsf failed"
}
@@ -73,7 +73,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
# Mount all shared folders from /etc/fstab. Normally this is done by some
# other startup script but this requires the vboxdrv kernel module loaded.
@@ -321,10 +306,8 @@ stop()
@@ -337,10 +322,8 @@ stop()
if ! umount -a -t vboxsf 2>/dev/null; then
fail "Cannot unmount vboxsf folders"
fi
@@ -86,7 +86,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
fi
if running_vboxguest; then
rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest"
@@ -483,16 +466,8 @@ extra_setup()
@@ -500,16 +483,8 @@ extra_setup()
# setup_script
setup()
{