1
0
forked from pool/virtualbox
virtualbox/vbox-vboxdrv-init-script.diff

108 lines
4.1 KiB
Diff
Raw Normal View History

Index: src/VBox/Installer/linux/vboxdrv.sh.in
===================================================================
--- src/VBox/Installer/linux/vboxdrv.sh.in.orig
+++ src/VBox/Installer/linux/vboxdrv.sh.in
@@ -19,11 +19,12 @@
#
### BEGIN INIT INFO
# Provides: vboxdrv
-# Required-Start: $syslog
-# Required-Stop:
-# Default-Start: 2 3 4 5
+# Required-Start: $syslog $remote_fs
+# Required-Stop: $syslog $remote_fs
+# Default-Start: 2 3 5
# Default-Stop: 0 1 6
-# Short-Description: VirtualBox Linux kernel module
+# Short-Description: VirtualBox Linux module
+# Description: VirtualBox Linux kernel module
### END INIT INFO
PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
Accepting request 214248 from home:saschpe:branches:Virtualization - Update to version 4.3.6: + VMM: fixed a Guru Meditation VINF_EM_TRIPLE_FAULT caused by VMCB caching with nested paging on certain AMD CPUs (bug #12451) + VMM: fixed a Guru Meditation VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE while intercepting debug exceptions (VT-x only; bug #12410) + VMM: fixed a Guru Meditation VERR_SVM_UNEXPECTED_EXIT while intercepting debug register accesses (AMD-V only; bug #12481) + VMM: fixed a VERR_SSM_STRUCTURE_MAGIC error when trying to load a saved state made with VBox 4.3.4 when VT-x/AMD-V is disabled. Unfortunately, VBox 4.3.4 produced broken saved states for this configuration so you have to discard these states (bug #12414) + VMM: added a few more MSRs to the whitelist required by certain guests (bug #12245) + GUI: fixed deleting of inaccessible VMs (4.3 regression, bug #12205) + GUI: fixed warnings in VM settings / number of guest processors (bug #12480) + Main: don't automatically enable 64-bit guests on 64-bit hosts if VT-x/AMD-V is not available (bug #12424) + Main: always expose the DMI memory information to Windows 2012 guests (bug #12017) + Main: fixed occasional crashes on guest display resolution change (bug #7063) + Main: fixed reporting back temporary name when calling IGuestSession::DirectoryCreateTemp() (bug #12498) + API: fix for a hang when launching a GUI VM through the API, which crashes due to GUI unavailability + Storage: fix for BLKCACHE_IOERR runtime errors under rare circumstances (bug #11030) + Network: allow to start more than 5 PCNet instances (bug #12426) + E1000: if the cable was disconnected before the guest initialized the device, the link status was not properly set to 'down' after the initialization completed despite the fact that there was no connection + 3D support: fixed offset of guest 3D image elements (Mac OS X Retina hosts only; bug #11021) + Solaris hosts: fixed accessing the host driver from non-global zones (4.3 regression, bug #12271) - For more changes see https://www.virtualbox.org/wiki/Changelog - Add source services (refresh_patches ATM) - Rebased patches: + vbox-disable-updates.diff (only offset) + vbox-fpie.diff (only offset) + vbox-deprec-gsoap-service-proxies.diff (manually) + vbox-gsoapssl-deps.diff (manually) + vbox-no-build-dates.diff (manually) + vbox-permissions_warning.diff (manually) + vbox-python-detection.diff (manually) + vbox-smc-napa.diff (manually) + vbox-vboxdrv-init-script.diff (manually) OBS-URL: https://build.opensuse.org/request/show/214248 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=150
2014-01-19 01:52:50 +01:00
@@ -191,13 +192,6 @@ start()
fi
fi
# ensure permissions
- if ! chown :%GROUP% $DEVICE 2>/dev/null; then
- rmmod vboxpci 2>/dev/null
- rmmod vboxnetadp 2>/dev/null
- rmmod vboxnetflt 2>/dev/null
- rmmod vboxdrv 2>/dev/null
- failure "Cannot change group %GROUP% for device $DEVICE"
- fi
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
fi
Accepting request 214248 from home:saschpe:branches:Virtualization - Update to version 4.3.6: + VMM: fixed a Guru Meditation VINF_EM_TRIPLE_FAULT caused by VMCB caching with nested paging on certain AMD CPUs (bug #12451) + VMM: fixed a Guru Meditation VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE while intercepting debug exceptions (VT-x only; bug #12410) + VMM: fixed a Guru Meditation VERR_SVM_UNEXPECTED_EXIT while intercepting debug register accesses (AMD-V only; bug #12481) + VMM: fixed a VERR_SSM_STRUCTURE_MAGIC error when trying to load a saved state made with VBox 4.3.4 when VT-x/AMD-V is disabled. Unfortunately, VBox 4.3.4 produced broken saved states for this configuration so you have to discard these states (bug #12414) + VMM: added a few more MSRs to the whitelist required by certain guests (bug #12245) + GUI: fixed deleting of inaccessible VMs (4.3 regression, bug #12205) + GUI: fixed warnings in VM settings / number of guest processors (bug #12480) + Main: don't automatically enable 64-bit guests on 64-bit hosts if VT-x/AMD-V is not available (bug #12424) + Main: always expose the DMI memory information to Windows 2012 guests (bug #12017) + Main: fixed occasional crashes on guest display resolution change (bug #7063) + Main: fixed reporting back temporary name when calling IGuestSession::DirectoryCreateTemp() (bug #12498) + API: fix for a hang when launching a GUI VM through the API, which crashes due to GUI unavailability + Storage: fix for BLKCACHE_IOERR runtime errors under rare circumstances (bug #11030) + Network: allow to start more than 5 PCNet instances (bug #12426) + E1000: if the cable was disconnected before the guest initialized the device, the link status was not properly set to 'down' after the initialization completed despite the fact that there was no connection + 3D support: fixed offset of guest 3D image elements (Mac OS X Retina hosts only; bug #11021) + Solaris hosts: fixed accessing the host driver from non-global zones (4.3 regression, bug #12271) - For more changes see https://www.virtualbox.org/wiki/Changelog - Add source services (refresh_patches ATM) - Rebased patches: + vbox-disable-updates.diff (only offset) + vbox-fpie.diff (only offset) + vbox-deprec-gsoap-service-proxies.diff (manually) + vbox-gsoapssl-deps.diff (manually) + vbox-no-build-dates.diff (manually) + vbox-permissions_warning.diff (manually) + vbox-python-detection.diff (manually) + vbox-smc-napa.diff (manually) + vbox-vboxdrv-init-script.diff (manually) OBS-URL: https://build.opensuse.org/request/show/214248 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=150
2014-01-19 01:52:50 +01:00
@@ -295,70 +289,8 @@ stop_vms()
# setup_script
setup()
{
- stop
- DKMS=`which dkms 2>/dev/null`
- if [ -n "$DKMS" ]; then
- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
- begin_msg "Removing old VirtualBox pci kernel module"
- find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
- begin_msg "Removing old VirtualBox netadp kernel module"
- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
- begin_msg "Removing old VirtualBox netflt kernel module"
- find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
- begin_msg "Removing old VirtualBox kernel module"
- find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if [ -n "$DKMS" ]; then
- begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
- if ! $DODKMS install vboxhost $VERSION >> $LOG; then
- fail_msg "Failed, trying without DKMS"
- DKMS=""
- fi
- fi
- if [ -z "$DKMS" ]; then
- begin_msg "Recompiling VirtualBox kernel modules"
- if ! $BUILDINTMP \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxdrv" \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxnetflt" \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxnetadp" \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxpci" \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- fi
- rm -f /etc/vbox/module_not_compiled
+ begin_msg "Recompiling VirtualBox kernel module, NOT. It has been packaged."
succ_msg
- start
}
dmnstatus()