Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at 2012-05-16 21:10:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox", Maintainer is "mkudlv...@novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2012-05-07
22:53:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes
2012-05-16 21:10:46.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 15 12:16:30 UTC 2012 - mse...@gmail.com
+
+- modify vboxadd-init-script.diff to fix issues with missing
+ config file on guest [bnc#761923]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vbox-vboxadd-init-script.diff ++++++
--- /var/tmp/diff_new_pack.8CQzDJ/_old 2012-05-16 21:10:48.000000000 +0200
+++ /var/tmp/diff_new_pack.8CQzDJ/_new 2012-05-16 21:10:48.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- 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 @@
+# 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 @@
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 @@
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 @@
fi
fi
}
-@@ -308,8 +295,7 @@ start()
+@@ -308,8 +298,7 @@ start()
do_vboxguest_non_udev;;
esac
@@ -63,7 +70,7 @@
$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 @@
# 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 @@
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()
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
