From a01b90028f96d3a482e85393ea10bb236c3029b0 Mon Sep 17 00:00:00 2001
From: Jacob Coffee <jacob@z7x.org>
Date: Wed, 17 Jul 2024 10:28:29 -0500
Subject: [PATCH] fix(base): disable ntp installed on noble (#386)

* fix(base): disable ntp installed on noble

* feat(base): add timesyncd state

* Update salt/base/sanity.sls

* chore: simplify code block

* feat: add new custom grain check for containers
---
 salt/base/sanity.sls | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/salt/base/sanity.sls b/salt/base/sanity.sls
index 33acfa66..714d1e77 100644
--- a/salt/base/sanity.sls
+++ b/salt/base/sanity.sls
@@ -5,7 +5,19 @@ niceties:
       - htop
       - traceroute
 
-time-sync:
+{% if grains["oscodename"] in ["noble"] %}
+systemd-timesyncd:
+   pkg:
+     - installed
+   service:
+     {% if grains["detect_virt"] in ["docker"] %}
+     - enabled
+     {% else %}
+     - running
+     - enable: True
+    {% endif %}
+{% else %}
+ntp-packages:
   pkg.installed:
     - pkgs:
       - ntp
@@ -15,7 +27,7 @@ ntp:
   service:
     - running
     - enable: True
-
+{% endif %}
 
 # Cron has a default $PATH of only /usr/bin:/bin, however the root user's
 # default $PATH in the shell includes various sbin directories. This can cause