Merge pull request #3476 from tstromberg/vbox-timesync

VirtualBox time cleanup: sync on boot, don't run timesyncd
kubernetes · Dec 21, 2018 · ad57efb · ad57efb
2 parents ae4221b + e4303eb
commit ad57efb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service b/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service
@@ -4,9 +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
-ExecStart=/usr/sbin/VBoxService -f --disable-automount
+# 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