Make GRUB2 info-file sharable

plus3it · Jun 4, 2024 · 217bdf0 · 217bdf0
1 parent 6b38279
commit 217bdf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ash-linux/el9/RuleById/high/grub2_info.jinja → ...inux/el9/RuleById/common/grub2_info.jinja b/ash-linux/el9/RuleById/high/grub2_info.jinja → ...inux/el9/RuleById/common/grub2_info.jinja
diff --git a/ash-linux/el9/RuleById/medium/content_rule_grub2_uefi_admin_username.sls b/ash-linux/el9/RuleById/medium/content_rule_grub2_uefi_admin_username.sls
@@ -112,8 +112,11 @@
 ################################################################################
 {%- set stig_id = 'grub2_uefi_admin_username' %}
 {%- set helperLoc = tpldir ~ '/files' %}
-{%- from tpldir ~ '/grub2_info.jinja' import grubEncryptedPass with context %}
-{%- from tpldir ~ '/grub2_info.jinja' import grubUser with context %}
+{#- Set location for common content #}
+{%- set commonContent = 'salt://' ~ salt.file.dirname(tpldir) ~ '/common' %}
+{%- set grub2InfoJinja = commonContent + '/grub2_info.jinja'
+{%- from grub2InfoJinja import grubEncryptedPass with context %}
+{%- from grub2InfoJinja import grubUser with context %}
 {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %}
 {%- set mustSet = salt.pillar.get('ash-linux:lookup:grub-passwd', '') %}
 {%- set grubUserFile = '/etc/grub.d/01_users' %}