From 5cdce156c36b3c44ab3a3d63032f46b786256069 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 9 Dec 2019 15:20:59 +0100 Subject: [PATCH] Add EFI support for grub.cfg generation On UEFI-enabled systems, the location of grub.cfg is different. Signed-off-by: Alexandru Avadanii Change-Id: I0fefe733587ca1fb0f12975eadfaad2e19fbd02c --- ansible/roles/security/tasks/main.yml | 9 +++++++++ rpmbuild.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ansible/roles/security/tasks/main.yml b/ansible/roles/security/tasks/main.yml index 22e3197..acf307a 100644 --- a/ansible/roles/security/tasks/main.yml +++ b/ansible/roles/security/tasks/main.yml @@ -27,9 +27,18 @@ - host_os is defined - host_os.grub2_password | default(False, True) + - name: check whether grub-efi exists + stat: + path: /boot/efi/EFI/centos/grub.cfg + register: grub_efi_file_stat + - name: generate grub config command: /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg + - name: generate grub-efi config + command: /usr/sbin/grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg + when: grub_efi_file_stat.stat.exists == true + - name: chsh/chfn right setting file: path: "{{ item }}" diff --git a/rpmbuild.spec b/rpmbuild.spec index bae2da4..ee00155 100644 --- a/rpmbuild.spec +++ b/rpmbuild.spec @@ -15,7 +15,7 @@ %define COMPONENT security %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 -%define RPM_MINOR_VERSION 9 +%define RPM_MINOR_VERSION 10 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} -- 2.16.6