From 2a995a3fe69289511d56e9b3ec274635068a9bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Reegn?= Date: Tue, 6 Aug 2019 10:27:15 +0200 Subject: [PATCH] Reenable systemd-timesyncd, except on virtualbox This commit attempts to add back the missing time synchronization feature to Minikube that was removed earlier with #3476. As mentioned in #1378 we have an alternative solution for time synchronization for Oracle VirtualBox, so there we don't want to enable systemd-timesyncd. We are using systemd conditional activation on systemd-timesyncd and exclude systems that have an oracle hypervisor hosting the vm (currently that's virtualbox for our purposes). --- .../system/systemd-timesyncd.service.d/disable-virtualbox.conf | 2 ++ deploy/iso/minikube-iso/configs/minikube_defconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/disable-virtualbox.conf diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/disable-virtualbox.conf b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/systemd/system/systemd-timesyncd.service.d/disable-virtualbox.conf new file mode 100644 index 000000000000..c732fdedb2c5 --- /dev/null +++ b/deploy/iso/minikube-iso/board/coreos/minikube/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 index ab24b3652a3c..bcdf54963ac9 100644 --- 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 \ No newline at end of file +BR2_PACKAGE_SYSTEMD_TIMESYNCD=y