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.

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

Include warning regarding quota options in XFS #9879

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ fixtext: '{{{ fixtext_mount_option("/home", "grpquota") }}}'

srg_requirement: '{{{ srg_requirement_mount_option("/home", "grpquota") }}}'

{{% if "ol" not in product %}}
template:
name: mount_option
vars:
mountpoint: /home
mountoption: grpquota
mount_has_to_exist: 'yes'
{{% else %}}
warnings:
- general: |-
The quota options for XFS file systems can only be activated when mounting the partition.
It is not possible to enable them by remounting an already mounted partition. Therefore,
if the desired options were not defined before mounting the partition, dismount and mount
it again to apply the quota options.
{{% if "ol" in product %}}
- functionality: |-
OVAL looks for partitions whose mount point is a substring of any interactive user's home
directory and validates that grpquota option is there. Because of this, there could be
Expand All @@ -52,8 +50,18 @@ warnings:
Bash remediation uses the <tt>df</tt> command to find out the partition where the home
directory is mounted. However, if the directory doesn't exist the remediation won't be
applied.
{{% endif %}}

{{% if "ol" in product %}}
template:
name: mount_option_home
vars:
mountoption: grpquota
{{% else %}}
template:
name: mount_option
vars:
mountpoint: /home
mountoption: grpquota
mount_has_to_exist: 'yes'
{{% endif %}}
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ fixtext: '{{{ fixtext_mount_option("/home", "usrquota") }}}'

srg_requirement: '{{{ srg_requirement_mount_option("/home", "usrquota") }}}'

{{% if "ol" not in product %}}
template:
name: mount_option
vars:
mountpoint: /home
mountoption: usrquota
mount_has_to_exist: 'yes'
{{% else %}}
warnings:
- general: |-
The quota options for XFS file systems can only be activated when mounting the partition.
It is not possible to enable them by remounting an already mounted partition. Therefore,
if the desired options were not defined before mounting the partition, dismount and mount
it again to apply the quota options.
{{% if "ol" in product %}}
- functionality: |-
OVAL looks for partitions whose mount point is a substring of any interactive user's home
directory and validates that usrquota option is there. Because of this, there could be
Expand All @@ -52,8 +50,18 @@ warnings:
Bash remediation uses the <tt>df</tt> command to find out the partition where the home
directory is mounted. However, if the directory doesn't exist the remediation won't be
applied.
{{% endif %}}

{{% if "ol" in product %}}
template:
name: mount_option_home
vars:
mountoption: usrquota
{{% else %}}
template:
name: mount_option
vars:
mountpoint: /home
mountoption: usrquota
mount_has_to_exist: 'yes'
{{% endif %}}