- Refresh patch:

* vbox-vboxadd-init-script.diff

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=191
This commit is contained in:
Tomáš Chvátal 2015-05-15 15:49:23 +00:00 committed by Git OBS Bridge
parent 210e7e1b2a
commit 5273e86527
2 changed files with 7 additions and 5 deletions

View File

@ -18,7 +18,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
### END INIT INFO ### END INIT INFO
PATH=$PATH:/bin:/sbin:/usr/sbin PATH=$PATH:/bin:/sbin:/usr/sbin
@@ -255,12 +256,6 @@ do_vboxguest_non_udev() @@ -257,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
@ -31,7 +31,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
if [ ! -c $userdev ]; then if [ ! -c $userdev ]; then
maj=10 maj=10
@@ -271,12 +266,6 @@ do_vboxguest_non_udev() @@ -273,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"
} }
@ -44,7 +44,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
fi fi
fi fi
} }
@@ -284,6 +273,13 @@ do_vboxguest_non_udev() @@ -286,6 +275,13 @@ do_vboxguest_non_udev()
start() start()
{ {
begin "Starting the VirtualBox Guest Additions "; begin "Starting the VirtualBox Guest Additions ";
@ -55,10 +55,10 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
+ fi + fi
+ fi + fi
+ +
uname -r | grep -q -E '^2\.6|^3' 2>/dev/null && uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
ps -A -o comm | grep -q '/*udevd$' 2>/dev/null || ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
no_udev=1 no_udev=1
@@ -491,32 +487,8 @@ extra_setup() @@ -493,32 +489,8 @@ extra_setup()
# setup_script # setup_script
setup() setup()
{ {

View File

@ -51,6 +51,8 @@ Fri May 15 07:49:31 UTC 2015 - tchvatal@suse.com
* X11 Additions: prevent flickering when updating mouse cursor * X11 Additions: prevent flickering when updating mouse cursor
* Solaris Additions: fixed incorrect usage of 'prtconf' while installing Guest * Solaris Additions: fixed incorrect usage of 'prtconf' while installing Guest
Additions (Solaris 10 only) Additions (Solaris 10 only)
- Refresh patch:
* vbox-vboxadd-init-script.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 10 10:47:58 UTC 2015 - bwiedemann@suse.com Sun May 10 10:47:58 UTC 2015 - bwiedemann@suse.com