Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve template macros for grub command line #10989

Merged
merged 4 commits into from
Aug 21, 2023
Merged

Improve template macros for grub command line #10989

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bf1509
Improve template macros for grub command line
teacup-on-rockingchair Aug 14, 2023
fe93d87
Drop trailing whitespaces
teacup-on-rockingchair Aug 14, 2023
42410fd
Add tests to cover cases of missing/commented GRUB_CMDLINE_LINUX cfg
teacup-on-rockingchair Aug 14, 2023
a2d4a97
Fix platform limitation for all sle and error in shebang
teacup-on-rockingchair Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...isabling_ipv6/grub2_ipv6_disable_argument/tests/cmd_line_commented_etcdefaultgrub.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bas
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing h

# platform = Red Hat Enterprise Linux 7,sle12,sle15
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't use the short IDs, you should use full names:

# platform = Red Hat Enterprise Linux 7,Oracle Linux 7,SUSE Linux Enterprise 12,SUSE Linux Enterprise 15

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

used a multi_platform_sle instead , anyways that was the idea


# Removes kernel command line in /etc/default/grub
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't exactly remove it, instead, it comments it out.

sed -i '/^\s*GRUB_CMDLINE_LINUX=/s//#&/' '/etc/default/grub'
5 changes: 5 additions & 0 deletions ...isabling_ipv6/grub2_ipv6_disable_argument/tests/cmd_line_not_there_etcdefaultgrub.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bas
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing h

# platform = Red Hat Enterprise Linux 7,sle12,sle15
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't use the short IDs, you should use full names


# Removes kernel command line in /etc/default/grub
sed -i '/^\s*GRUB_CMDLINE_LINUX=/d' '/etc/default/grub'
23 changes: 19 additions & 4 deletions shared/macros/10-ansible.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,23 +1184,38 @@ Part of the grub2_bootloader_argument template.
{{%- macro ansible_grub2_bootloader_argument(arg_name, arg_name_value) -%}}
{{% if 'ubuntu' in product or product in ['rhel7', 'ol7', 'sle12', 'sle15'] %}}
- name: Check {{{ arg_name }}} argument exists
command: grep 'GRUB_CMDLINE_LINUX.*{{{ arg_name }}}=' /etc/default/grub
command: grep '^\s*GRUB_CMDLINE_LINUX=.*{{{ arg_name }}}=' /etc/default/grub
failed_when: False
register: argcheck

- name: Check {{{ arg_name }}} argument exists
command: grep '^\s*GRUB_CMDLINE_LINUX=' /etc/default/grub
failed_when: False
register: linecheck

- name: Add watch rule for {{{ path }}} in /etc/audit/audit.rules
ansible.builtin.lineinfile:
line: 'GRUB_CMDLINE_LINUX="{{{ arg_name_value }}} "'
state: present
dest: /etc/default/grub
create: yes
mode: '0644'
when: argcheck.rc != 0 and linecheck.rc != 0

- name: Replace existing {{{ arg_name }}} argument
replace:
path: /etc/default/grub
regexp: '{{{ arg_name }}}=\w+'
replace: '{{{ arg_name_value }}}'
when: argcheck.rc == 0
when: argcheck.rc == 0 and linecheck.rc == 0

- name: Add {{{ arg_name }}} argument
replace:
path: /etc/default/grub
regexp: '(GRUB_CMDLINE_LINUX=.*)"'
regexp: '(^\s*GRUB_CMDLINE_LINUX=.*)"'
replace: '\1 {{{ arg_name_value }}}"'
when: argcheck.rc != 0
when: argcheck.rc != 0 and linecheck.rc == 0

{{% endif -%}}

{{% if product in ['sle12', 'sle15'] %}}
Expand Down
12 changes: 8 additions & 4 deletions shared/macros/10-bash.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1998,12 +1998,16 @@ fi
#}}
{{%- macro update_etc_default_grub_manually(arg_name, arg_name_value) -%}}
# Correct the form of default kernel command line in GRUB
if grep -q '^GRUB_CMDLINE_LINUX=.*{{{ arg_name }}}=.*"' '/etc/default/grub' ; then
if grep -q '^\s*GRUB_CMDLINE_LINUX=.*{{{ arg_name }}}=.*"' '/etc/default/grub' ; then
# modify the GRUB command-line if an {{{ arg_name }}}= arg already exists
sed -i "s/\(^GRUB_CMDLINE_LINUX=\".*\){{{ arg_name }}}=[^[:space:]]\+\(.*\"\)/\1{{{ arg_name_value }}}\2/" '/etc/default/grub'
else
sed -i "s/\(^\s*GRUB_CMDLINE_LINUX=\".*\){{{ arg_name }}}=[^[:space:]]\+\(.*\"\)/\1{{{ arg_name_value }}}\2/" '/etc/default/grub'
# Add to already existing GRUB_CMDLINE_LINUX parameters
elif grep -q '^\s*GRUB_CMDLINE_LINUX=' '/etc/default/grub' ; then
# no {{{ arg_name }}}=arg is present, append it
sed -i "s/\(^GRUB_CMDLINE_LINUX=\".*\)\"/\1 {{{ arg_name_value }}}\"/" '/etc/default/grub'
sed -i "s/\(^\s*GRUB_CMDLINE_LINUX=\".*\)\"/\1 {{{ arg_name_value }}}\"/" '/etc/default/grub'
# Add GRUB_CMDLINE_LINUX parameters line
else
echo "GRUB_CMDLINE_LINUX=\"{{{ arg_name_value }}}\"" >> '/etc/default/grub'
fi
{{%- endmacro %}}

Expand Down