diff mbox series

[2/2] policycoreutils/fixfiles.8: add missing file systems and merge check and verify

Message ID 20210203171654.37002-2-cgzones@googlemail.com (mailing list archive)
State Accepted
Headers show
Series [1/2] libselinux/getconlist: report failures | expand

Commit Message

Christian Göttsche Feb. 3, 2021, 5:16 p.m. UTC
Mention the supported file systems ext4, gfs2 and btrfs.

The options check and verify are interchangeable, merge their
description.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
 policycoreutils/scripts/fixfiles.8 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Petr Lautrbach Feb. 17, 2021, 5:15 p.m. UTC | #1
Christian Göttsche <cgzones@googlemail.com> writes:

> Mention the supported file systems ext4, gfs2 and btrfs.
>
> The options check and verify are interchangeable, merge their
> description.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>

Acked-by: Petr Lautrbach <plautrba@redhat.com>

> ---
>  policycoreutils/scripts/fixfiles.8 | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/policycoreutils/scripts/fixfiles.8 b/policycoreutils/scripts/fixfiles.8
> index 12342530..c4e894e5 100644
> --- a/policycoreutils/scripts/fixfiles.8
> +++ b/policycoreutils/scripts/fixfiles.8
> @@ -35,8 +35,8 @@ database (extended attributes) on filesystems.
>  .P
>  It can also be run at any time to relabel when adding support for
>  new policy, or  just check whether the file contexts are all
> -as you expect.  By default it will relabel all mounted ext2, ext3, xfs and 
> -jfs file systems as long as they do not have a security context mount 
> +as you expect.  By default it will relabel all mounted ext2, ext3, ext4, gfs2, xfs,
> +jfs and btrfs file systems as long as they do not have a security context mount
>  option.  You can use the \-R flag to use rpmpackages as an alternative.
>  The file /etc/selinux/fixfiles_exclude_dirs can contain a list of directories
>  excluded from relabeling.
> @@ -79,7 +79,7 @@ Modify verbosity from progress to verbose. (Run restorecon with \-v instead of \
>  .SH "ARGUMENTS"
>  One of:
>  .TP 
> -.B check
> +.B check | verify
>  print any incorrect file context labels, showing old and new context, but do not change them.
>  .TP 
>  .B restore
> @@ -88,9 +88,6 @@ change any incorrect file context labels.
>  .B relabel
>  Prompt for removal of contents of /tmp directory and then change any incorrect file context labels to match the install file_contexts file.
>  .TP 
> -.B verify
> -List out files with incorrect file context labels, but do not change them.
> -.TP 
>  .B [[dir/file] ... ] 
>  List of files or directories trees that you wish to check file context on.
>  
> -- 
> 2.30.0
Petr Lautrbach Feb. 19, 2021, 3:15 p.m. UTC | #2
Petr Lautrbach <plautrba@redhat.com> writes:

> Christian Göttsche <cgzones@googlemail.com> writes:
>
>> Mention the supported file systems ext4, gfs2 and btrfs.
>>
>> The options check and verify are interchangeable, merge their
>> description.
>>
>> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
>
> Acked-by: Petr Lautrbach <plautrba@redhat.com>

Merged, thanks!


>> ---
>>  policycoreutils/scripts/fixfiles.8 | 9 +++------
>>  1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/policycoreutils/scripts/fixfiles.8 b/policycoreutils/scripts/fixfiles.8
>> index 12342530..c4e894e5 100644
>> --- a/policycoreutils/scripts/fixfiles.8
>> +++ b/policycoreutils/scripts/fixfiles.8
>> @@ -35,8 +35,8 @@ database (extended attributes) on filesystems.
>>  .P
>>  It can also be run at any time to relabel when adding support for
>>  new policy, or  just check whether the file contexts are all
>> -as you expect.  By default it will relabel all mounted ext2, ext3, xfs and 
>> -jfs file systems as long as they do not have a security context mount 
>> +as you expect.  By default it will relabel all mounted ext2, ext3, ext4, gfs2, xfs,
>> +jfs and btrfs file systems as long as they do not have a security context mount
>>  option.  You can use the \-R flag to use rpmpackages as an alternative.
>>  The file /etc/selinux/fixfiles_exclude_dirs can contain a list of directories
>>  excluded from relabeling.
>> @@ -79,7 +79,7 @@ Modify verbosity from progress to verbose. (Run restorecon with \-v instead of \
>>  .SH "ARGUMENTS"
>>  One of:
>>  .TP 
>> -.B check
>> +.B check | verify
>>  print any incorrect file context labels, showing old and new context, but do not change them.
>>  .TP 
>>  .B restore
>> @@ -88,9 +88,6 @@ change any incorrect file context labels.
>>  .B relabel
>>  Prompt for removal of contents of /tmp directory and then change any incorrect file context labels to match the install file_contexts file.
>>  .TP 
>> -.B verify
>> -List out files with incorrect file context labels, but do not change them.
>> -.TP 
>>  .B [[dir/file] ... ] 
>>  List of files or directories trees that you wish to check file context on.
>>  
>> -- 
>> 2.30.0
diff mbox series

Patch

diff --git a/policycoreutils/scripts/fixfiles.8 b/policycoreutils/scripts/fixfiles.8
index 12342530..c4e894e5 100644
--- a/policycoreutils/scripts/fixfiles.8
+++ b/policycoreutils/scripts/fixfiles.8
@@ -35,8 +35,8 @@  database (extended attributes) on filesystems.
 .P
 It can also be run at any time to relabel when adding support for
 new policy, or  just check whether the file contexts are all
-as you expect.  By default it will relabel all mounted ext2, ext3, xfs and 
-jfs file systems as long as they do not have a security context mount 
+as you expect.  By default it will relabel all mounted ext2, ext3, ext4, gfs2, xfs,
+jfs and btrfs file systems as long as they do not have a security context mount
 option.  You can use the \-R flag to use rpmpackages as an alternative.
 The file /etc/selinux/fixfiles_exclude_dirs can contain a list of directories
 excluded from relabeling.
@@ -79,7 +79,7 @@  Modify verbosity from progress to verbose. (Run restorecon with \-v instead of \
 .SH "ARGUMENTS"
 One of:
 .TP 
-.B check
+.B check | verify
 print any incorrect file context labels, showing old and new context, but do not change them.
 .TP 
 .B restore
@@ -88,9 +88,6 @@  change any incorrect file context labels.
 .B relabel
 Prompt for removal of contents of /tmp directory and then change any incorrect file context labels to match the install file_contexts file.
 .TP 
-.B verify
-List out files with incorrect file context labels, but do not change them.
-.TP 
 .B [[dir/file] ... ] 
 List of files or directories trees that you wish to check file context on.