On Wed, Mar 2, 2022 at 7:21 PM Ondrej Mosnacek <omosnace@xxxxxxxxxx> wrote:
>
> On Fri, Feb 18, 2022 at 10:21 AM Petr Lautrbach <plautrba@xxxxxxxxxx> wrote:
> > Commit 93902fc8340f ("setfiles/restorecon: support parallel relabeling")
> > implemented support for parallel relabeling in setfiles. This is
> > available for fixfiles now.
> >
> > Signed-off-by: Petr Lautrbach <plautrba@xxxxxxxxxx>
> > ---
> >
> > - fixed echo commands for onboot
> >
> > policycoreutils/scripts/fixfiles | 35 +++++++++++++++++-------------
> > policycoreutils/scripts/fixfiles.8 | 17 ++++++++++-----
> > 2 files changed, 31 insertions(+), 21 deletions(-)
> >
> > diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
> > index 6fb12e0451a9..1ff4d9bdf04e 100755
> > --- a/policycoreutils/scripts/fixfiles
> > +++ b/policycoreutils/scripts/fixfiles
> [...]
> > @@ -342,17 +344,17 @@ esac
> > }
> > usage() {
> > echo $"""
> > -Usage: $0 [-v] [-F] [-M] [-f] relabel
> > +Usage: $0 [-v] [-F] [-M] [-f] [-T nthreads] relabel
> > or
> > -Usage: $0 [-v] [-F] [-B | -N time ] { check | restore | verify }
> > +Usage: $0 [-v] [-F] [-B | -N time ] [-T nthreads] { check | restore | verify }
>
> There is an extra space added here, but that can be fixed up when applying.
>
> > or
> > -Usage: $0 [-v] [-F] { check | restore | verify } dir/file ...
> > +Usage: $0 [-v] [-F] [-T nthreads] { check | restore | verify } dir/file ...
> > or
> > -Usage: $0 [-v] [-F] -R rpmpackage[,rpmpackage...] { check | restore | verify }
> > +Usage: $0 [-v] [-F] [-T nthreads] -R rpmpackage[,rpmpackage...] { check | restore | verify }
> > or
> > -Usage: $0 [-v] [-F] -C PREVIOUS_FILECONTEXT { check | restore | verify }
> > +Usage: $0 [-v] [-F] [-T nthreads] -C PREVIOUS_FILECONTEXT { check | restore | verify }
> > or
> > -Usage: $0 [-F] [-M] [-B] onboot
> > +Usage: $0 [-F] [-M] [-B] [-T nthreads] onboot
> > """
> > }
> >
> [...]
>
> Acked-by: Ondrej Mosnacek <omosnace@xxxxxxxxxx>
>
Applied (without the extra space)
Thanks,
Jim
> --
> Ondrej Mosnacek
> Software Engineer, Linux Security - SELinux kernel
> Red Hat, Inc.
>
