Skip to content

Commit

Permalink
Merge pull request #12937 from mpurg/fix_bootc_applicability
Browse files Browse the repository at this point in the history
 Disable bootc applicability checks on Ubuntu
  • Loading branch information
dodys authored Jan 30, 2025
2 parents dac81b5 + 9e4e1c8 commit c7a57e0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ fixtext: '{{{ fixtext_file_group_owner(grub2_boot_path ~ "/grub.cfg", "root") }}

srg_requirement: '{{{ srg_requirement_file_group_owner(grub2_boot_path ~ "/grub.cfg", "root") }}}'

{{% if 'ubuntu' in product %}}
platform: not container
{{% else %}}
platform: not bootc
{{% endif %}}

template:
name: file_groupowner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ ocil_clause: '{{{ ocil_clause_file_owner(file=grub2_boot_path ~ "/grub.cfg", own
ocil: |-
{{{ ocil_file_owner(file=grub2_boot_path ~ "/grub.cfg", owner="root") }}}
{{% if 'ubuntu' in product %}}
platform: not container
{{% else %}}
platform: not bootc
{{% endif %}}

template:
name: file_owner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ ocil: |-
If properly configured, the output should indicate the following
permissions: <tt>-rw-------</tt>
{{% if 'ubuntu' in product %}}
platform: not container
{{% else %}}
platform: not bootc
{{% endif %}}

template:
name: file_permissions
Expand Down
4 changes: 4 additions & 0 deletions linux_os/guide/system/permissions/partitions/group.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ description: |-
are set in the <tt>/etc/fstab</tt> configuration file, and can be
used to make certain types of malicious behavior more difficult.
{{% if 'ubuntu' in product %}}
platform: not container
{{% else %}}
platform: not container and not bootc
{{% endif %}}
4 changes: 4 additions & 0 deletions linux_os/guide/system/software/disk_partitioning/group.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,8 @@ description: |-
modify it to create separate logical volumes for the directories
listed above. The Logical Volume Manager (LVM) makes this possible.
{{% if 'ubuntu' in product %}}
platform: not container
{{% else %}}
platform: not container and not bootc
{{% endif %}}

0 comments on commit c7a57e0

Please sign in to comment.