Merge pull request #4991 from reegnz/bugfix/reenable-systemd-timesyncd

Re-Added time synchronization between host/VM
kubernetes · Aug 14, 2019 · 25e057c · 25e057c
2 parents 2be6484 + 2a995a3
commit 25e057c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...ube/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/disable-virtualbox.conf b/...ube/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/disable-virtualbox.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionVirtualization=!oracle
diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig
@@ -59,4 +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
+BR2_PACKAGE_SYSTEMD_TIMESYNCD=y