From 681e515d479093c43b55d54579fa61b73559b706 Mon Sep 17 00:00:00 2001 From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com> Date: Fri, 29 Sep 2023 18:34:14 +0200 Subject: [PATCH] Add grub.cfg to noveriablcgen.json --- util/files/noveriablcgen_config.json.jinja | 3 ++- util/noveriablcgen.sls | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/util/files/noveriablcgen_config.json.jinja b/util/files/noveriablcgen_config.json.jinja index d7a917b..09ccd24 100644 --- a/util/files/noveriablcgen_config.json.jinja +++ b/util/files/noveriablcgen_config.json.jinja @@ -2,5 +2,6 @@ "be_env_dir": "{{ BTRFS_ROOT }}", "grub_conf_dir": "{{ GRUB_CONFD }}", "filename": "{{ GRUB_CONFIG_FILENAME }}", - "root_uuid": "{{ ROOT_UUID }}" + "root_uuid": "{{ ROOT_UUID }}", + "grub_cfg": "{{ GRUB_CONFIG }}" } diff --git a/util/noveriablcgen.sls b/util/noveriablcgen.sls index 75185ba..2d1dfd5 100644 --- a/util/noveriablcgen.sls +++ b/util/noveriablcgen.sls @@ -32,6 +32,7 @@ util_noveriablcgen_config: GRUB_CONFD: "/etc/grub.d" GRUB_CONFIG_FILENAME: "10_noveria.conf" ROOT_UUID: {{ salt['cmd.shell']('lsblk -o LABEL,UUID | grep ROOT | awk \'{print $2}\'') }} + GRUB_CONFIG: "/boot/grub/grub.cfg" - mode: '0644' - user: root - group: root