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

74 lines
2.6 KiB
Diff
Raw Normal View History

- Removed "vbox_fix_4.10_api_changes.patch" - fixed upstream Removed "vbox_fix_4.11_api_changes.patch" - fixed upstream - Version bump to 5.1.16 (released 2017-03-08 by Oracle) This is a maintenance release. The following items were fixed and/or added: VMM: don't access the MSR_IA32_SMM_MONITOR_CTL MSR if dual-monitor treatment is not available (KVM workaround, bug #14965) VMM: another fix for handling certain MSRs on ancient CPUs without VT-x support for MSR bitmaps VMM: fixed VERR_SSM_LOAD_CPUID_MISMATCH errors when restoring a saved state with SMP guests on hosts without the CPUID/HTT bit set (bug #16428) VMM: fixed a bug in call gate emulation VMM: FWAIT instruction fix VMM: fixed a sporadic guest hang under certain conditions GUI: hide the mini-toolbar from the taskbar and the pager on certain X11 hosts GUI: better error handling on the global settings / network / host-only / DHCP server settings GUI: fixes for full-screen with multiple screens Host-only Network: fixed host-only adapter creation issue preventing VirtualBox installation on Windows 10 hosts (bug #16379) NAT network: fixed two potential crashes in the DHCP server ICH9: fixed incorrect initialization of the primary bus for PCI bridges (5.1.14 regression) Storage: LsiLogic fix for Windows 10 USB: fixed not being able to attach certain USB devices having invalid characters in the device strings (5.0.18 regression; bug #15956) USB: several fixes for the USB/IP support (bug #16462) VBoxSVC: fixed another crash during shutdown under rare circumstances VBoxSVC: fixed a stack overflow on (Windows debug builds only; bug #16409) OVF: when importing an appliance handle more than 10 network adapters if the OVA was created by VirtualBox (bug #16401) OVF: fixes for exporting and importing appliances with many disks (bug #16402) VBoxManage: fixed regression with modifyhd --resize (bug #16311) rdesktop-vrdp: source code tarball fixes Linux Installers: do not rebuild kernel modules unnecessarily (bug #16408) Linux hosts: added an action for opening the VM manager window to the .desktop file Linux hosts / guests: Linux 4.11 compile fixes (bug #16506) Linux Additions: added vboxsf FS modules alias (bug #16404) Linux Additions: fix for the shared folders kernel module to compile on Linux 4.10 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=317
2017-03-09 19:59:35 +01:00
Index: VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
- Removed "vbox_fix_4.10_api_changes.patch" - fixed upstream Removed "vbox_fix_4.11_api_changes.patch" - fixed upstream - Version bump to 5.1.16 (released 2017-03-08 by Oracle) This is a maintenance release. The following items were fixed and/or added: VMM: don't access the MSR_IA32_SMM_MONITOR_CTL MSR if dual-monitor treatment is not available (KVM workaround, bug #14965) VMM: another fix for handling certain MSRs on ancient CPUs without VT-x support for MSR bitmaps VMM: fixed VERR_SSM_LOAD_CPUID_MISMATCH errors when restoring a saved state with SMP guests on hosts without the CPUID/HTT bit set (bug #16428) VMM: fixed a bug in call gate emulation VMM: FWAIT instruction fix VMM: fixed a sporadic guest hang under certain conditions GUI: hide the mini-toolbar from the taskbar and the pager on certain X11 hosts GUI: better error handling on the global settings / network / host-only / DHCP server settings GUI: fixes for full-screen with multiple screens Host-only Network: fixed host-only adapter creation issue preventing VirtualBox installation on Windows 10 hosts (bug #16379) NAT network: fixed two potential crashes in the DHCP server ICH9: fixed incorrect initialization of the primary bus for PCI bridges (5.1.14 regression) Storage: LsiLogic fix for Windows 10 USB: fixed not being able to attach certain USB devices having invalid characters in the device strings (5.0.18 regression; bug #15956) USB: several fixes for the USB/IP support (bug #16462) VBoxSVC: fixed another crash during shutdown under rare circumstances VBoxSVC: fixed a stack overflow on (Windows debug builds only; bug #16409) OVF: when importing an appliance handle more than 10 network adapters if the OVA was created by VirtualBox (bug #16401) OVF: fixes for exporting and importing appliances with many disks (bug #16402) VBoxManage: fixed regression with modifyhd --resize (bug #16311) rdesktop-vrdp: source code tarball fixes Linux Installers: do not rebuild kernel modules unnecessarily (bug #16408) Linux hosts: added an action for opening the VM manager window to the .desktop file Linux hosts / guests: Linux 4.11 compile fixes (bug #16506) Linux Additions: added vboxsf FS modules alias (bug #16404) Linux Additions: fix for the shared folders kernel module to compile on Linux 4.10 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=317
2017-03-09 19:59:35 +01:00
--- VirtualBox-5.1.16.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh
@@ -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
## @todo This file duplicates a lot of script with vboxadd.sh. When making
- Removed "vbox_fix_4.10_api_changes.patch" - fixed upstream Removed "vbox_fix_4.11_api_changes.patch" - fixed upstream - Version bump to 5.1.16 (released 2017-03-08 by Oracle) This is a maintenance release. The following items were fixed and/or added: VMM: don't access the MSR_IA32_SMM_MONITOR_CTL MSR if dual-monitor treatment is not available (KVM workaround, bug #14965) VMM: another fix for handling certain MSRs on ancient CPUs without VT-x support for MSR bitmaps VMM: fixed VERR_SSM_LOAD_CPUID_MISMATCH errors when restoring a saved state with SMP guests on hosts without the CPUID/HTT bit set (bug #16428) VMM: fixed a bug in call gate emulation VMM: FWAIT instruction fix VMM: fixed a sporadic guest hang under certain conditions GUI: hide the mini-toolbar from the taskbar and the pager on certain X11 hosts GUI: better error handling on the global settings / network / host-only / DHCP server settings GUI: fixes for full-screen with multiple screens Host-only Network: fixed host-only adapter creation issue preventing VirtualBox installation on Windows 10 hosts (bug #16379) NAT network: fixed two potential crashes in the DHCP server ICH9: fixed incorrect initialization of the primary bus for PCI bridges (5.1.14 regression) Storage: LsiLogic fix for Windows 10 USB: fixed not being able to attach certain USB devices having invalid characters in the device strings (5.0.18 regression; bug #15956) USB: several fixes for the USB/IP support (bug #16462) VBoxSVC: fixed another crash during shutdown under rare circumstances VBoxSVC: fixed a stack overflow on (Windows debug builds only; bug #16409) OVF: when importing an appliance handle more than 10 network adapters if the OVA was created by VirtualBox (bug #16401) OVF: fixes for exporting and importing appliances with many disks (bug #16402) VBoxManage: fixed regression with modifyhd --resize (bug #16311) rdesktop-vrdp: source code tarball fixes Linux Installers: do not rebuild kernel modules unnecessarily (bug #16408) Linux hosts: added an action for opening the VM manager window to the .desktop file Linux hosts / guests: Linux 4.11 compile fixes (bug #16506) Linux Additions: added vboxsf FS modules alias (bug #16404) Linux Additions: fix for the shared folders kernel module to compile on Linux 4.10 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=317
2017-03-09 19:59:35 +01:00
@@ -261,13 +262,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
- Removed "vbox_fix_4.10_api_changes.patch" - fixed upstream Removed "vbox_fix_4.11_api_changes.patch" - fixed upstream - Version bump to 5.1.16 (released 2017-03-08 by Oracle) This is a maintenance release. The following items were fixed and/or added: VMM: don't access the MSR_IA32_SMM_MONITOR_CTL MSR if dual-monitor treatment is not available (KVM workaround, bug #14965) VMM: another fix for handling certain MSRs on ancient CPUs without VT-x support for MSR bitmaps VMM: fixed VERR_SSM_LOAD_CPUID_MISMATCH errors when restoring a saved state with SMP guests on hosts without the CPUID/HTT bit set (bug #16428) VMM: fixed a bug in call gate emulation VMM: FWAIT instruction fix VMM: fixed a sporadic guest hang under certain conditions GUI: hide the mini-toolbar from the taskbar and the pager on certain X11 hosts GUI: better error handling on the global settings / network / host-only / DHCP server settings GUI: fixes for full-screen with multiple screens Host-only Network: fixed host-only adapter creation issue preventing VirtualBox installation on Windows 10 hosts (bug #16379) NAT network: fixed two potential crashes in the DHCP server ICH9: fixed incorrect initialization of the primary bus for PCI bridges (5.1.14 regression) Storage: LsiLogic fix for Windows 10 USB: fixed not being able to attach certain USB devices having invalid characters in the device strings (5.0.18 regression; bug #15956) USB: several fixes for the USB/IP support (bug #16462) VBoxSVC: fixed another crash during shutdown under rare circumstances VBoxSVC: fixed a stack overflow on (Windows debug builds only; bug #16409) OVF: when importing an appliance handle more than 10 network adapters if the OVA was created by VirtualBox (bug #16401) OVF: fixes for exporting and importing appliances with many disks (bug #16402) VBoxManage: fixed regression with modifyhd --resize (bug #16311) rdesktop-vrdp: source code tarball fixes Linux Installers: do not rebuild kernel modules unnecessarily (bug #16408) Linux hosts: added an action for opening the VM manager window to the .desktop file Linux hosts / guests: Linux 4.11 compile fixes (bug #16506) Linux Additions: added vboxsf FS modules alias (bug #16404) Linux Additions: fix for the shared folders kernel module to compile on Linux 4.10 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=317
2017-03-09 19:59:35 +01:00
@@ -387,35 +381,8 @@ cleanup()
# setup_script
setup()
{
- begin_msg "Building VirtualBox kernel modules" console
- if ! $BUILDINTMP \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxdrv" \
- --no-print-directory install >> $LOG 2>&1; then
- "${INSTALL_DIR}/check_module_dependencies.sh"
- 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
- rm -f /etc/vbox/module_not_compiled
- depmod -a
- succ_msg "VirtualBox kernel modules built"
2017-05-10 20:01:46 +02:00
+# Try to build the host kernel modules in case prepackaging has failed
+ /sbin/vboxconfig
}
dmnstatus()