diff --git a/vbox-vboxadd-init-script.diff b/vbox-vboxadd-init-script.diff index ef4037b..af71e90 100644 --- a/vbox-vboxadd-init-script.diff +++ b/vbox-vboxadd-init-script.diff @@ -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 -@@ -21,11 +21,12 @@ +@@ -21,14 +21,18 @@ # ### BEGIN INIT INFO # Provides: vboxadd @@ -17,8 +17,15 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh +# Short-Description: VirtualBox Linux Additions kernel modules ### END INIT INFO - . /var/lib/VBoxGuestAdditions/config -@@ -169,8 +170,6 @@ fi +-. /var/lib/VBoxGuestAdditions/config ++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 userdev=/dev/vboxuser @@ -27,7 +34,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh 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" } fi @@ -40,7 +47,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh if [ ! -c $userdev ]; then maj=10 -@@ -272,12 +265,6 @@ do_vboxguest_non_udev() +@@ -272,12 +268,6 @@ do_vboxguest_non_udev() rmmod vboxguest 2>/dev/null 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 } -@@ -308,8 +295,7 @@ start() +@@ -308,8 +298,7 @@ start() do_vboxguest_non_udev;; esac @@ -63,7 +70,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 -@@ -319,8 +305,7 @@ start() +@@ -319,8 +308,7 @@ start() fi 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 # 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 fail "Cannot unmount vboxsf folders" fi @@ -86,7 +93,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh fi if running_vboxguest; then 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() { diff --git a/virtualbox.changes b/virtualbox.changes index 2804343..602cf32 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -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