[PATCH] policycoreutils/setfiles: Improve description of -d switch

[PATCH] policycoreutils/setfiles: Improve description of -d switch

[Petr Lautrbach]

From: Vit Mojzis <vmojzis@redhat.com>

The "-q" switch is becoming obsolete (completely unused in fedora) and
debug output ("-d" switch) makes sense in any scenario. Therefore both
options can be specified at once.

Resolves: rhbz#1271327

Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
---
 policycoreutils/setfiles/setfiles.8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
index 15f939d1bee0..0aab2aa24681 100644
--- a/policycoreutils/setfiles/setfiles.8
+++ b/policycoreutils/setfiles/setfiles.8
@@ -59,7 +59,7 @@ option will force a replacement of the entire context.
 check the validity of the contexts against the specified binary policy.
 .TP
 .B \-d
-show what specification matched each file.
+show what specification matched each file. Not affected by "\-q".
 .TP
 .BI \-e \ directory
 directory to exclude (repeat option for more than one directory).
-- 
2.35.1

Re: [PATCH] policycoreutils/setfiles: Improve description of -d switch

[James Carter]

On Fri, Apr 1, 2022 at 9:45 AM Petr Lautrbach <plautrba@redhat.com> wrote:
>
> From: Vit Mojzis <vmojzis@redhat.com>
>
> The "-q" switch is becoming obsolete (completely unused in fedora) and
> debug output ("-d" switch) makes sense in any scenario. Therefore both
> options can be specified at once.
>
> Resolves: rhbz#1271327
>
> Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
> ---
>  policycoreutils/setfiles/setfiles.8 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
> index 15f939d1bee0..0aab2aa24681 100644
> --- a/policycoreutils/setfiles/setfiles.8
> +++ b/policycoreutils/setfiles/setfiles.8
> @@ -59,7 +59,7 @@ option will force a replacement of the entire context.
>  check the validity of the contexts against the specified binary policy.
>  .TP
>  .B \-d
> -show what specification matched each file.
> +show what specification matched each file. Not affected by "\-q".
>  .TP
>  .BI \-e \ directory
>  directory to exclude (repeat option for more than one directory).
> --
> 2.35.1
>

Looking at setfiles.c, specifying "-q" doesn't do anything at all, so
it makes more sense to me to change what it says for "-q".

Maybe:
Deprecated and replaced by "-v". Has no effect on other options or on
program behavior.

Jim

[PATCH v2] setfiles.8: -q is deprecated and has no effect

[Petr Lautrbach]

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
---
 policycoreutils/setfiles/setfiles.8 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
index 15f939d1bee0..5267064de3b5 100644
--- a/policycoreutils/setfiles/setfiles.8
+++ b/policycoreutils/setfiles/setfiles.8
@@ -124,7 +124,9 @@ and
 options are mutually exclusive.
 .TP 
 .B \-q
-Deprecated, was only used to stop printing inode association parameters.
+Deprecated and replaced by
+.B \-v
+. Has no effect on other options or on program behavior.
 .TP 
 .BI \-r \ rootpath
 use an alternate root path. Used in meta-selinux for OpenEmbedded/Yocto builds
-- 
2.35.1

Re: [PATCH v2] setfiles.8: -q is deprecated and has no effect

[James Carter]

On Tue, Apr 5, 2022 at 3:38 AM Petr Lautrbach <plautrba@redhat.com> wrote:
>
> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
> ---
>  policycoreutils/setfiles/setfiles.8 | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
> index 15f939d1bee0..5267064de3b5 100644
> --- a/policycoreutils/setfiles/setfiles.8
> +++ b/policycoreutils/setfiles/setfiles.8
> @@ -124,7 +124,9 @@ and
>  options are mutually exclusive.
>  .TP
>  .B \-q
> -Deprecated, was only used to stop printing inode association parameters.
> +Deprecated and replaced by
> +.B \-v
> +. Has no effect on other options or on program behavior.

The "." at the beginning causes that line to not appear.

I am no man page expert, but this seems to work.

.B \-q
Deprecated and replaced by \fB\-v\fR. Has no effect on other options
or on program
behavior.

Thanks,
Jim

>  .TP
>  .BI \-r \ rootpath
>  use an alternate root path. Used in meta-selinux for OpenEmbedded/Yocto builds
> --
> 2.35.1
>

Re: [PATCH v2] setfiles.8: -q is deprecated and has no effect

[Petr Lautrbach]

James Carter <jwcart2@gmail.com> writes:

> On Tue, Apr 5, 2022 at 3:38 AM Petr Lautrbach <plautrba@redhat.com> wrote:
>>
>> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
>> ---
>>  policycoreutils/setfiles/setfiles.8 | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
>> index 15f939d1bee0..5267064de3b5 100644
>> --- a/policycoreutils/setfiles/setfiles.8
>> +++ b/policycoreutils/setfiles/setfiles.8
>> @@ -124,7 +124,9 @@ and
>>  options are mutually exclusive.
>>  .TP
>>  .B \-q
>> -Deprecated, was only used to stop printing inode association parameters.
>> +Deprecated and replaced by
>> +.B \-v
>> +. Has no effect on other options or on program behavior.
>
> The "." at the beginning causes that line to not appear.
>
> I am no man page expert, but this seems to work.
>
> .B \-q
> Deprecated and replaced by \fB\-v\fR. Has no effect on other options
> or on program
> behavior.
>

I'm sorry for that. I really thought I opened the page and checked it
works. Apparently I didn't :(


> Thanks,
> Jim
>
>>  .TP
>>  .BI \-r \ rootpath
>>  use an alternate root path. Used in meta-selinux for OpenEmbedded/Yocto builds
>> --
>> 2.35.1
>>

[PATCH v3] setfiles.8: -q is deprecated and has no effect

[Petr Lautrbach]

From: James Carter <jwcart2@gmail.com>

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
---
 policycoreutils/setfiles/setfiles.8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
index 15f939d1bee0..19b59a2cc90d 100644
--- a/policycoreutils/setfiles/setfiles.8
+++ b/policycoreutils/setfiles/setfiles.8
@@ -124,7 +124,7 @@ and
 options are mutually exclusive.
 .TP 
 .B \-q
-Deprecated, was only used to stop printing inode association parameters.
+Deprecated and replaced by \fB\-v\fR. Has no effect on other options or on program behavior.
 .TP 
 .BI \-r \ rootpath
 use an alternate root path. Used in meta-selinux for OpenEmbedded/Yocto builds
-- 
2.35.1

Re: [PATCH v3] setfiles.8: -q is deprecated and has no effect

[James Carter]

On Fri, Apr 8, 2022 at 4:59 AM Petr Lautrbach <plautrba@redhat.com> wrote:
>
> From: James Carter <jwcart2@gmail.com>
>
> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>

Acked-by: James Carter <jwcart2@gmail.com>

> ---
>  policycoreutils/setfiles/setfiles.8 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
> index 15f939d1bee0..19b59a2cc90d 100644
> --- a/policycoreutils/setfiles/setfiles.8
> +++ b/policycoreutils/setfiles/setfiles.8
> @@ -124,7 +124,7 @@ and
>  options are mutually exclusive.
>  .TP
>  .B \-q
> -Deprecated, was only used to stop printing inode association parameters.
> +Deprecated and replaced by \fB\-v\fR. Has no effect on other options or on program behavior.
>  .TP
>  .BI \-r \ rootpath
>  use an alternate root path. Used in meta-selinux for OpenEmbedded/Yocto builds
> --
> 2.35.1
>

Re: [PATCH v3] setfiles.8: -q is deprecated and has no effect

[James Carter]

On Mon, Apr 11, 2022 at 8:39 AM James Carter <jwcart2@gmail.com> wrote:
>
> On Fri, Apr 8, 2022 at 4:59 AM Petr Lautrbach <plautrba@redhat.com> wrote:
> >
> > From: James Carter <jwcart2@gmail.com>
> >
> > Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
>
> Acked-by: James Carter <jwcart2@gmail.com>
>

Merged.
Thanks,
Jim

> > ---
> >  policycoreutils/setfiles/setfiles.8 | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/policycoreutils/setfiles/setfiles.8 b/policycoreutils/setfiles/setfiles.8
> > index 15f939d1bee0..19b59a2cc90d 100644
> > --- a/policycoreutils/setfiles/setfiles.8
> > +++ b/policycoreutils/setfiles/setfiles.8
> > @@ -124,7 +124,7 @@ and
> >  options are mutually exclusive.
> >  .TP
> >  .B \-q
> > -Deprecated, was only used to stop printing inode association parameters.
> > +Deprecated and replaced by \fB\-v\fR. Has no effect on other options or on program behavior.
> >  .TP
> >  .BI \-r \ rootpath
> >  use an alternate root path. Used in meta-selinux for OpenEmbedded/Yocto builds
> > --
> > 2.35.1
> >