jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 121070 from home:mseben:branches:Virtualization

Browse Source 
modify vboxadd-init-script.diff to fix issues with missing config file on guest [bnc#761923]

OBS-URL: https://build.opensuse.org/request/show/121070
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=90
This commit is contained in:
Michal Seben 2012-05-15 12:27:37 +00:00 committed by Git OBS Bridge
parent 5186adc741
commit f6602c5741
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vbox-vboxadd-init-script.diff
View File

@ -2,7 +2,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
=================================================================== ===================================================================
--- src/VBox/Additions/linux/installer/vboxadd.sh.orig --- src/VBox/Additions/linux/installer/vboxadd.sh.orig
+++ src/VBox/Additions/linux/installer/vboxadd.sh +++ src/VBox/Additions/linux/installer/vboxadd.sh
@@ -21,11 +21,12 @@ @@ -21,14 +21,18 @@
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: vboxadd # Provides: vboxadd
@ -17,8 +17,15 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
+# Short-Description: VirtualBox Linux Additions kernel modules +# Short-Description: VirtualBox Linux Additions kernel modules
### END INIT INFO ### END INIT INFO
. /var/lib/VBoxGuestAdditions/config -. /var/lib/VBoxGuestAdditions/config
@@ -169,8 +170,6 @@ fi +if [ -f /var/lib/VBoxGuestAdditions/config ]; then
+ . /var/lib/VBoxGuestAdditions/config
+fi
+
export BUILD_TYPE
export USERNAME
@@ -169,8 +173,6 @@ fi
dev=/dev/vboxguest dev=/dev/vboxguest
userdev=/dev/vboxuser userdev=/dev/vboxuser
@ -27,7 +34,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
test_for_gcc_and_make() test_for_gcc_and_make()
{ {
@@ -256,12 +255,6 @@ do_vboxguest_non_udev() @@ -256,12 +258,6 @@ do_vboxguest_non_udev()
fail "Cannot create device $dev with major $maj and minor $min" fail "Cannot create device $dev with major $maj and minor $min"
} }
fi fi
@ -40,7 +47,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
if [ ! -c $userdev ]; then if [ ! -c $userdev ]; then
maj=10 maj=10
@@ -272,12 +265,6 @@ do_vboxguest_non_udev() @@ -272,12 +268,6 @@ do_vboxguest_non_udev()
rmmod vboxguest 2>/dev/null rmmod vboxguest 2>/dev/null
fail "Cannot create device $userdev with major $maj and minor $min" fail "Cannot create device $userdev with major $maj and minor $min"
} }
@ -53,7 +60,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
fi fi
fi fi
} }
@@ -308,8 +295,7 @@ start() @@ -308,8 +298,7 @@ start()
do_vboxguest_non_udev;; do_vboxguest_non_udev;;
esac esac
@ -63,7 +70,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
$MODPROBE vboxsf > /dev/null 2>&1 || { $MODPROBE vboxsf > /dev/null 2>&1 || {
if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
fail_msg fail_msg
@@ -319,8 +305,7 @@ start() @@ -319,8 +308,7 @@ start()
fi fi
fail "modprobe vboxsf failed" fail "modprobe vboxsf failed"
} }
@ -73,7 +80,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
# Mount all shared folders from /etc/fstab. Normally this is done by some # Mount all shared folders from /etc/fstab. Normally this is done by some
# other startup script but this requires the vboxdrv kernel module loaded. # other startup script but this requires the vboxdrv kernel module loaded.
@@ -337,10 +322,8 @@ stop() @@ -337,10 +325,8 @@ stop()
if ! umount -a -t vboxsf 2>/dev/null; then if ! umount -a -t vboxsf 2>/dev/null; then
fail "Cannot unmount vboxsf folders" fail "Cannot unmount vboxsf folders"
fi fi
@ -86,7 +93,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
fi fi
if running_vboxguest; then if running_vboxguest; then
rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest" rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest"
@@ -500,16 +483,8 @@ extra_setup() @@ -500,16 +486,8 @@ extra_setup()
# setup_script # setup_script
setup() setup()
{ {

6
virtualbox.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 15 12:16:30 UTC 2012 - mseben@gmail.com
- modify vboxadd-init-script.diff to fix issues with missing
config file on guest [bnc#761923]
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 29 16:02:54 UTC 2012 - mseben@gmail.com Sun Apr 29 16:02:54 UTC 2012 - mseben@gmail.com