From c3ce6ba0ec775fa75a9951c5576e5f4fd910af55 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Mon, 17 Dec 2018 11:59:00 -0800 Subject: [PATCH 1/5] Force vbox timesync at boot --- .../iso/minikube-iso/package/vbox-guest/vboxservice.service | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service b/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service index 01a07184bcd6..547cbfc712d8 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service +++ b/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service @@ -6,7 +6,9 @@ ConditionVirtualization=oracle ExecStartPre=-/usr/sbin/modprobe vboxguest ExecStartPre=-/usr/sbin/modprobe vboxvideo ExecStartPre=-/usr/sbin/modprobe vboxsf -ExecStart=/usr/sbin/VBoxService -f --disable-automount +# Normally, VirtualBox only syncs every 20 minutes. This syncs on start, +# restore, and forces an immediate sync if VM time is over 5 seconds off. +ExecStart=/usr/sbin/VBoxService -f --disable-automount --timesync-set-start --timesync-set-on-restore=1 --timesync-set-threshold 5000 [Install] WantedBy=multi-user.target From cee128ad3a308a9bb2c4e715ae03128b39c40dff Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Mon, 17 Dec 2018 11:59:23 -0800 Subject: [PATCH 2/5] Disable timesyncd: not used in our environment --- deploy/iso/minikube-iso/configs/minikube_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index c70b9fec76de..ab24b3652a3c 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -59,3 +59,4 @@ BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/isolinux.cfg" BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2TOOLS=y +BR2_PACKAGE_SYSTEMD_TIMESYNCD=n \ No newline at end of file From cbe5878ef2a29fe70ce743848388ec9f49cdbcbb Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Mon, 17 Dec 2018 11:59:35 -0800 Subject: [PATCH 3/5] Upgrade vbox from 5.1.38 to 5.2.22 --- deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash | 6 +++--- deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash index 191a7c833dbf..377932370601 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash +++ b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash @@ -1,3 +1,3 @@ -# From http://download.virtualbox.org/virtualbox/5.1.30/SHA256SUMS -sha256 96cab2296fb014ce0a16b7b9603b52208b9403c10c1524b44201d3c274e8a821 VirtualBox-5.1.38.tar.bz2 -sha256 0e7ee2c78ebf7cd0d3a933d51148bef04a64f64fb27ccf70d59cddf9ca1e517a VBoxGuestAdditions_5.1.38.iso +# From http://download.virtualbox.org/virtualbox/5.2.22/SHA256SUMS +sha256 5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4 VirtualBox-5.2.22.tar.bz2 +sha256 e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603 VBoxGuestAdditions_5.2.22.iso diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk index d813259f09b7..13c7a3e71702 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk +++ b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk @@ -4,15 +4,16 @@ # ################################################################################ -VBOX_GUEST_VERSION = 5.1.38 +VBOX_GUEST_VERSION = 5.2.22 VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION) VBOX_GUEST_LICENSE = GPLv2 VBOX_GUEST_LICENSE_FILES = COPYING -VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2 VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso +# Not sure if this is actually used, but the build seems to require it. +VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2 define VBOX_GUEST_EXPORT_MODULES - ( cd $(@D)/src/VBox/Additions/linux; ./export_modules modules.tar.gz ) + ( cd $(@D)/src/VBox/Additions/linux; ./export_modules.sh modules.tar.gz ) mkdir -p $(@D)/vbox-modules tar -C $(@D)/vbox-modules -xzf $(@D)/src/VBox/Additions/linux/modules.tar.gz endef From 9a2600e791edb95110171ac0e3a6b27e372e51b9 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 20 Dec 2018 11:46:54 -0800 Subject: [PATCH 4/5] Revert "Upgrade vbox from 5.1.38 to 5.2.22" This reverts commit cbe5878ef2a29fe70ce743848388ec9f49cdbcbb. --- deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash | 6 +++--- deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash index 377932370601..191a7c833dbf 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash +++ b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash @@ -1,3 +1,3 @@ -# From http://download.virtualbox.org/virtualbox/5.2.22/SHA256SUMS -sha256 5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4 VirtualBox-5.2.22.tar.bz2 -sha256 e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603 VBoxGuestAdditions_5.2.22.iso +# From http://download.virtualbox.org/virtualbox/5.1.30/SHA256SUMS +sha256 96cab2296fb014ce0a16b7b9603b52208b9403c10c1524b44201d3c274e8a821 VirtualBox-5.1.38.tar.bz2 +sha256 0e7ee2c78ebf7cd0d3a933d51148bef04a64f64fb27ccf70d59cddf9ca1e517a VBoxGuestAdditions_5.1.38.iso diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk index 13c7a3e71702..d813259f09b7 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk +++ b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk @@ -4,16 +4,15 @@ # ################################################################################ -VBOX_GUEST_VERSION = 5.2.22 +VBOX_GUEST_VERSION = 5.1.38 VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION) VBOX_GUEST_LICENSE = GPLv2 VBOX_GUEST_LICENSE_FILES = COPYING -VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso -# Not sure if this is actually used, but the build seems to require it. VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2 +VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso define VBOX_GUEST_EXPORT_MODULES - ( cd $(@D)/src/VBox/Additions/linux; ./export_modules.sh modules.tar.gz ) + ( cd $(@D)/src/VBox/Additions/linux; ./export_modules modules.tar.gz ) mkdir -p $(@D)/vbox-modules tar -C $(@D)/vbox-modules -xzf $(@D)/src/VBox/Additions/linux/modules.tar.gz endef From e4303ebb915c04354c82cbb20e09a150cf3e7ae9 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 20 Dec 2018 13:54:57 -0800 Subject: [PATCH 5/5] Disable vboxvideo and remove timesync-set-on-restore: neither work correctly w/ 5.1.x drivers in minikube --- .../package/vbox-guest/vboxservice.service | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service b/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service index 547cbfc712d8..5f05bd3d20d1 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service +++ b/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service @@ -4,11 +4,14 @@ ConditionVirtualization=oracle [Service] ExecStartPre=-/usr/sbin/modprobe vboxguest -ExecStartPre=-/usr/sbin/modprobe vboxvideo + +# Broken and probably unused: Unknown symbol ttm_bo_del_sub_from_lru +# ExecStartPre=-/usr/sbin/modprobe vboxvideo + ExecStartPre=-/usr/sbin/modprobe vboxsf -# Normally, VirtualBox only syncs every 20 minutes. This syncs on start, -# restore, and forces an immediate sync if VM time is over 5 seconds off. -ExecStart=/usr/sbin/VBoxService -f --disable-automount --timesync-set-start --timesync-set-on-restore=1 --timesync-set-threshold 5000 +# Normally, VirtualBox only syncs every 20 minutes. This syncs on start, and +# forces an immediate sync if VM time is over 5 seconds off. +ExecStart=/usr/sbin/VBoxService -f --disable-automount --timesync-set-start --timesync-set-threshold 5000 [Install] WantedBy=multi-user.target