From 751dfc0a5aafad9c482e14787d18394a18387ec7 Mon Sep 17 00:00:00 2001
From: Miha Purg <miha.purg@canonical.com>
Date: Mon, 27 Jan 2025 10:49:01 +0100
Subject: [PATCH] Use _guard_var templates for timesync services on Ubuntu
 24.04

---
 .../services/ntp/service_chronyd_disabled/rule.yml    | 10 ++++++++++
 .../services/ntp/service_chronyd_enabled/rule.yml     | 10 ++++++++++
 .../services/ntp/service_timesyncd_disabled/rule.yml  | 11 ++++++++++-
 .../services/ntp/service_timesyncd_enabled/rule.yml   | 10 ++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/linux_os/guide/services/ntp/service_chronyd_disabled/rule.yml b/linux_os/guide/services/ntp/service_chronyd_disabled/rule.yml
index 58733e2ec9e..75cfd848618 100644
--- a/linux_os/guide/services/ntp/service_chronyd_disabled/rule.yml
+++ b/linux_os/guide/services/ntp/service_chronyd_disabled/rule.yml
@@ -13,6 +13,15 @@ severity: medium
 
 platform: package[chrony]
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_disabled_guard_var
+    vars:
+        packagename: chrony
+        servicename: chrony
+        variable: var_timesync_service
+        value: chronyd
+{{%- else %}}
 template:
     name: service_disabled
     vars:
@@ -21,3 +30,4 @@ template:
         servicename@ubuntu2004: chrony
         servicename@ubuntu2204: chrony
         servicename@debian12: chrony
+{{%- endif %}}
diff --git a/linux_os/guide/services/ntp/service_chronyd_enabled/rule.yml b/linux_os/guide/services/ntp/service_chronyd_enabled/rule.yml
index 9623fd696aa..863ee78ba12 100644
--- a/linux_os/guide/services/ntp/service_chronyd_enabled/rule.yml
+++ b/linux_os/guide/services/ntp/service_chronyd_enabled/rule.yml
@@ -41,6 +41,15 @@ fixtext: '{{{ fixtext_service_enabled(service="chronyd") }}}'
 
 srg_requirement: '{{{ srg_requirement_service_enabled(service="chronyd") }}}'
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_enabled_guard_var
+    vars:
+        packagename: chrony
+        servicename: chrony
+        variable: var_timesync_service
+        value: chronyd
+{{%- else %}}
 template:
     name: service_enabled
     vars:
@@ -49,3 +58,4 @@ template:
         servicename@ubuntu2004: chrony
         servicename@ubuntu2204: chrony
         servicename@debian12: chrony
+{{%- endif %}}
diff --git a/linux_os/guide/services/ntp/service_timesyncd_disabled/rule.yml b/linux_os/guide/services/ntp/service_timesyncd_disabled/rule.yml
index 4128dcd2104..068d5079f7d 100644
--- a/linux_os/guide/services/ntp/service_timesyncd_disabled/rule.yml
+++ b/linux_os/guide/services/ntp/service_timesyncd_disabled/rule.yml
@@ -1,6 +1,5 @@
 documentation_complete: true
 
-
 title: 'Disable systemd_timesyncd Service'
 
 description: |-
@@ -18,8 +17,18 @@ severity: medium
 
 platform: package[systemd-timesyncd]
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_disabled_guard_var
+    vars:
+        packagename: systemd-timesyncd
+        servicename: systemd-timesyncd
+        variable: var_timesync_service
+        value: systemd-timesyncd
+{{%- else %}}
 template:
     name: service_disabled
     vars:
         servicename: systemd-timesyncd
         packagename: systemd-timesyncd
+{{%- endif %}}
diff --git a/linux_os/guide/services/ntp/service_timesyncd_enabled/rule.yml b/linux_os/guide/services/ntp/service_timesyncd_enabled/rule.yml
index 7e2ee284164..e0e0f1dd412 100644
--- a/linux_os/guide/services/ntp/service_timesyncd_enabled/rule.yml
+++ b/linux_os/guide/services/ntp/service_timesyncd_enabled/rule.yml
@@ -43,8 +43,18 @@ references:
 ocil: |-
     {{{ ocil_service_enabled(service="systemd_timesyncd") }}}
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_enabled_guard_var
+    vars:
+        packagename: systemd-timesyncd
+        servicename: systemd-timesyncd
+        variable: var_timesync_service
+        value: systemd-timesyncd
+{{%- else %}}
 template:
     name: service_enabled
     vars:
         servicename: systemd-timesyncd
         packagename: systemd
+{{%- endif %}}