* [PATCH] policycoreutils/fixfiles: Use parallel relabeling
@ 2022-02-16 17:49 Petr Lautrbach
2022-02-17 14:00 ` Ondrej Mosnacek
0 siblings, 1 reply; 5+ messages in thread
From: Petr Lautrbach @ 2022-02-16 17:49 UTC (permalink / raw)
To: selinux; +Cc: Petr Lautrbach
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@redhat.com>
---
policycoreutils/scripts/fixfiles | 33 +++++++++++++++++-------------
policycoreutils/scripts/fixfiles.8 | 17 +++++++++------
2 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
index 6fb12e0451a9..33db1d3bfb61 100755
--- a/policycoreutils/scripts/fixfiles
+++ b/policycoreutils/scripts/fixfiles
@@ -109,6 +109,7 @@ fullFlag=0
BOOTTIME=""
VERBOSE="-p"
FORCEFLAG=""
+THREADS=""
RPMFILES=""
PREFC=""
RESTORE_MODE=""
@@ -152,7 +153,7 @@ newer() {
shift
LogReadOnly
for m in `echo $FILESYSTEMSRW`; do
- find $m -mount -newermt $DATE -print0 2>/dev/null | ${RESTORECON} ${FORCEFLAG} ${VERBOSE} $* -i -0 -f -
+ find $m -mount -newermt $DATE -print0 2>/dev/null | ${RESTORECON} ${FORCEFLAG} ${VERBOSE} ${THREADS} $* -i -0 -f -
done;
}
@@ -196,7 +197,7 @@ if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
esac; \
fi; \
done | \
- ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -i -R -f -; \
+ ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -i -R -f -; \
rm -f ${TEMPFILE} ${PREFCTEMPFILE}
fi
}
@@ -234,11 +235,11 @@ LogExcluded
case "$RESTORE_MODE" in
RPMFILES)
for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
- rpmlist $i | ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -i -R -f -
+ rpmlist $i | ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -i -R -f -
done
;;
FILEPATH)
- ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -R -- "$FILEPATH"
+ ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -R -- "$FILEPATH"
;;
*)
if [ -n "${FILESYSTEMSRW}" ]; then
@@ -246,7 +247,7 @@ case "$RESTORE_MODE" in
echo "${OPTION}ing `echo ${FILESYSTEMSRW}`"
if [ -z "$BIND_MOUNT_FILESYSTEMS" ]; then
- ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${FC} ${FILESYSTEMSRW}
+ ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${THREADS} ${FC} ${FILESYSTEMSRW}
else
# we bind mount so we can fix the labels of files that have already been
# mounted over
@@ -256,7 +257,7 @@ case "$RESTORE_MODE" in
mkdir -p "${TMP_MOUNT}${m}" || exit 1
mount --bind "${m}" "${TMP_MOUNT}${m}" || exit 1
- ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${FC} -r "${TMP_MOUNT}" "${TMP_MOUNT}${m}"
+ ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -q ${FC} -r "${TMP_MOUNT}" "${TMP_MOUNT}${m}"
umount "${TMP_MOUNT}${m}" || exit 1
rm -rf "${TMP_MOUNT}" || echo "Error cleaning up."
done;
@@ -330,7 +331,8 @@ case "$1" in
> /.autorelabel || exit $?
[ -z "$FORCEFLAG" ] || echo -n "$FORCEFLAG " >> /.autorelabel
[ -z "$BOOTTIME" ] || echo -N $BOOTTIME >> /.autorelabel
- [ -z "$BIND_MOUNT_FILESYSTEMS" ] || echo "-M" >> /.autorelabel
+ [ -z "$BIND_MOUNT_FILESYSTEMS" ] || echo "-M " >> /.autorelabel
+ [ -z "$THREADS" ] || echo -n "$THREADS " >> /.autorelabel
# Force full relabel if SELinux is not enabled
selinuxenabled || echo -F > /.autorelabel
echo "System will relabel on next boot"
@@ -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 }
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
"""
}
@@ -371,7 +373,7 @@ set_restore_mode() {
}
# See how we were called.
-while getopts "N:BC:FfR:l:vM" i; do
+while getopts "N:BC:FfR:l:vMT:" i; do
case "$i" in
B)
BOOTTIME=`/bin/who -b | awk '{print $3}'`
@@ -406,6 +408,9 @@ while getopts "N:BC:FfR:l:vM" i; do
f)
fullFlag=1
;;
+ T)
+ THREADS="-T $OPTARG"
+ ;;
*)
usage
exit 1
diff --git a/policycoreutils/scripts/fixfiles.8 b/policycoreutils/scripts/fixfiles.8
index c4e894e56e8f..9a317d9181e2 100644
--- a/policycoreutils/scripts/fixfiles.8
+++ b/policycoreutils/scripts/fixfiles.8
@@ -6,22 +6,22 @@ fixfiles \- fix file SELinux security contexts.
.na
.B fixfiles
-.I [\-v] [\-F] [-M] [\-f] relabel
+.I [\-v] [\-F] [-M] [\-f] [\-T nthreads] relabel
.B fixfiles
-.I [\-v] [\-F] { check | restore | verify } dir/file ...
+.I [\-v] [\-F] [\-T nthreads] { check | restore | verify } dir/file ...
.B fixfiles
-.I [\-v] [\-F] [\-B | \-N time ] { check | restore | verify }
+.I [\-v] [\-F] [\-B | \-N time ] [\-T nthreads] { check | restore | verify }
.B fixfiles
-.I [\-v] [\-F] \-R rpmpackagename[,rpmpackagename...] { check | restore | verify }
+.I [\-v] [\-F] [\-T nthreads] \-R rpmpackagename[,rpmpackagename...] { check | restore | verify }
.B fixfiles
-.I [\-v] [\-F] \-C PREVIOUS_FILECONTEXT { check | restore | verify }
+.I [\-v] [\-F] [\-T nthreads] \-C PREVIOUS_FILECONTEXT { check | restore | verify }
.B fixfiles
-.I [-F] [-M] [-B] onboot
+.I [-F] [-M] [-B] [\-T nthreads] onboot
.ad
@@ -76,6 +76,11 @@ Bind mount filesystems before relabeling them, this allows fixing the context of
.B -v
Modify verbosity from progress to verbose. (Run restorecon with \-v instead of \-p)
+.TP
+.B \-T nthreads
+Use parallel relabeling, see
+.B setfiles(8)
+
.SH "ARGUMENTS"
One of:
.TP
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] policycoreutils/fixfiles: Use parallel relabeling
2022-02-16 17:49 [PATCH] policycoreutils/fixfiles: Use parallel relabeling Petr Lautrbach
@ 2022-02-17 14:00 ` Ondrej Mosnacek
2022-02-18 9:20 ` [PATCH v2] " Petr Lautrbach
0 siblings, 1 reply; 5+ messages in thread
From: Ondrej Mosnacek @ 2022-02-17 14:00 UTC (permalink / raw)
To: Petr Lautrbach; +Cc: SElinux list
On Wed, Feb 16, 2022 at 6:49 PM Petr Lautrbach <plautrba@redhat.com> 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@redhat.com>
> ---
> policycoreutils/scripts/fixfiles | 33 +++++++++++++++++-------------
> policycoreutils/scripts/fixfiles.8 | 17 +++++++++------
> 2 files changed, 30 insertions(+), 20 deletions(-)
>
> diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
> index 6fb12e0451a9..33db1d3bfb61 100755
> --- a/policycoreutils/scripts/fixfiles
> +++ b/policycoreutils/scripts/fixfiles
[...]
> @@ -330,7 +331,8 @@ case "$1" in
> > /.autorelabel || exit $?
> [ -z "$FORCEFLAG" ] || echo -n "$FORCEFLAG " >> /.autorelabel
> [ -z "$BOOTTIME" ] || echo -N $BOOTTIME >> /.autorelabel
> - [ -z "$BIND_MOUNT_FILESYSTEMS" ] || echo "-M" >> /.autorelabel
> + [ -z "$BIND_MOUNT_FILESYSTEMS" ] || echo "-M " >> /.autorelabel
I believe you need -n here? Although the line above also doesn't have
it... I guess the contents get the whitespace squashed in the end
anyway? Still, would be nice to clean up all these lines to use a
consistent pattern. I'd prefer:
echo -n "$SOMETHING "
(or in case of the variable containing an argument:)
echo -n "-X $XXX "
> + [ -z "$THREADS" ] || echo -n "$THREADS " >> /.autorelabel
> # Force full relabel if SELinux is not enabled
> selinuxenabled || echo -F > /.autorelabel
> echo "System will relabel on next boot"
[...]
--
Ondrej Mosnacek
Software Engineer, Linux Security - SELinux kernel
Red Hat, Inc.
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2] policycoreutils/fixfiles: Use parallel relabeling
2022-02-17 14:00 ` Ondrej Mosnacek
@ 2022-02-18 9:20 ` Petr Lautrbach
2022-03-02 16:20 ` Ondrej Mosnacek
0 siblings, 1 reply; 5+ messages in thread
From: Petr Lautrbach @ 2022-02-18 9:20 UTC (permalink / raw)
To: selinux; +Cc: Petr Lautrbach
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@redhat.com>
---
- 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
@@ -109,6 +109,7 @@ fullFlag=0
BOOTTIME=""
VERBOSE="-p"
FORCEFLAG=""
+THREADS=""
RPMFILES=""
PREFC=""
RESTORE_MODE=""
@@ -152,7 +153,7 @@ newer() {
shift
LogReadOnly
for m in `echo $FILESYSTEMSRW`; do
- find $m -mount -newermt $DATE -print0 2>/dev/null | ${RESTORECON} ${FORCEFLAG} ${VERBOSE} $* -i -0 -f -
+ find $m -mount -newermt $DATE -print0 2>/dev/null | ${RESTORECON} ${FORCEFLAG} ${VERBOSE} ${THREADS} $* -i -0 -f -
done;
}
@@ -196,7 +197,7 @@ if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
esac; \
fi; \
done | \
- ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -i -R -f -; \
+ ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -i -R -f -; \
rm -f ${TEMPFILE} ${PREFCTEMPFILE}
fi
}
@@ -234,11 +235,11 @@ LogExcluded
case "$RESTORE_MODE" in
RPMFILES)
for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
- rpmlist $i | ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -i -R -f -
+ rpmlist $i | ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -i -R -f -
done
;;
FILEPATH)
- ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -R -- "$FILEPATH"
+ ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -R -- "$FILEPATH"
;;
*)
if [ -n "${FILESYSTEMSRW}" ]; then
@@ -246,7 +247,7 @@ case "$RESTORE_MODE" in
echo "${OPTION}ing `echo ${FILESYSTEMSRW}`"
if [ -z "$BIND_MOUNT_FILESYSTEMS" ]; then
- ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${FC} ${FILESYSTEMSRW}
+ ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${THREADS} ${FC} ${FILESYSTEMSRW}
else
# we bind mount so we can fix the labels of files that have already been
# mounted over
@@ -256,7 +257,7 @@ case "$RESTORE_MODE" in
mkdir -p "${TMP_MOUNT}${m}" || exit 1
mount --bind "${m}" "${TMP_MOUNT}${m}" || exit 1
- ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${FC} -r "${TMP_MOUNT}" "${TMP_MOUNT}${m}"
+ ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -q ${FC} -r "${TMP_MOUNT}" "${TMP_MOUNT}${m}"
umount "${TMP_MOUNT}${m}" || exit 1
rm -rf "${TMP_MOUNT}" || echo "Error cleaning up."
done;
@@ -329,8 +330,9 @@ case "$1" in
fi
> /.autorelabel || exit $?
[ -z "$FORCEFLAG" ] || echo -n "$FORCEFLAG " >> /.autorelabel
- [ -z "$BOOTTIME" ] || echo -N $BOOTTIME >> /.autorelabel
- [ -z "$BIND_MOUNT_FILESYSTEMS" ] || echo "-M" >> /.autorelabel
+ [ -z "$BOOTTIME" ] || echo -n "-N $BOOTTIME " >> /.autorelabel
+ [ -z "$BIND_MOUNT_FILESYSTEMS" ] || echo -n "-M " >> /.autorelabel
+ [ -z "$THREADS" ] || echo -n "$THREADS " >> /.autorelabel
# Force full relabel if SELinux is not enabled
selinuxenabled || echo -F > /.autorelabel
echo "System will relabel on next boot"
@@ -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 }
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
"""
}
@@ -371,7 +373,7 @@ set_restore_mode() {
}
# See how we were called.
-while getopts "N:BC:FfR:l:vM" i; do
+while getopts "N:BC:FfR:l:vMT:" i; do
case "$i" in
B)
BOOTTIME=`/bin/who -b | awk '{print $3}'`
@@ -406,6 +408,9 @@ while getopts "N:BC:FfR:l:vM" i; do
f)
fullFlag=1
;;
+ T)
+ THREADS="-T $OPTARG"
+ ;;
*)
usage
exit 1
diff --git a/policycoreutils/scripts/fixfiles.8 b/policycoreutils/scripts/fixfiles.8
index c4e894e56e8f..9a317d9181e2 100644
--- a/policycoreutils/scripts/fixfiles.8
+++ b/policycoreutils/scripts/fixfiles.8
@@ -6,22 +6,22 @@ fixfiles \- fix file SELinux security contexts.
.na
.B fixfiles
-.I [\-v] [\-F] [-M] [\-f] relabel
+.I [\-v] [\-F] [-M] [\-f] [\-T nthreads] relabel
.B fixfiles
-.I [\-v] [\-F] { check | restore | verify } dir/file ...
+.I [\-v] [\-F] [\-T nthreads] { check | restore | verify } dir/file ...
.B fixfiles
-.I [\-v] [\-F] [\-B | \-N time ] { check | restore | verify }
+.I [\-v] [\-F] [\-B | \-N time ] [\-T nthreads] { check | restore | verify }
.B fixfiles
-.I [\-v] [\-F] \-R rpmpackagename[,rpmpackagename...] { check | restore | verify }
+.I [\-v] [\-F] [\-T nthreads] \-R rpmpackagename[,rpmpackagename...] { check | restore | verify }
.B fixfiles
-.I [\-v] [\-F] \-C PREVIOUS_FILECONTEXT { check | restore | verify }
+.I [\-v] [\-F] [\-T nthreads] \-C PREVIOUS_FILECONTEXT { check | restore | verify }
.B fixfiles
-.I [-F] [-M] [-B] onboot
+.I [-F] [-M] [-B] [\-T nthreads] onboot
.ad
@@ -76,6 +76,11 @@ Bind mount filesystems before relabeling them, this allows fixing the context of
.B -v
Modify verbosity from progress to verbose. (Run restorecon with \-v instead of \-p)
+.TP
+.B \-T nthreads
+Use parallel relabeling, see
+.B setfiles(8)
+
.SH "ARGUMENTS"
One of:
.TP
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] policycoreutils/fixfiles: Use parallel relabeling
2022-02-18 9:20 ` [PATCH v2] " Petr Lautrbach
@ 2022-03-02 16:20 ` Ondrej Mosnacek
2022-03-11 16:02 ` James Carter
0 siblings, 1 reply; 5+ messages in thread
From: Ondrej Mosnacek @ 2022-03-02 16:20 UTC (permalink / raw)
To: Petr Lautrbach; +Cc: SElinux list
On Fri, Feb 18, 2022 at 10:21 AM Petr Lautrbach <plautrba@redhat.com> 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@redhat.com>
> ---
>
> - 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@redhat.com>
--
Ondrej Mosnacek
Software Engineer, Linux Security - SELinux kernel
Red Hat, Inc.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] policycoreutils/fixfiles: Use parallel relabeling
2022-03-02 16:20 ` Ondrej Mosnacek
@ 2022-03-11 16:02 ` James Carter
0 siblings, 0 replies; 5+ messages in thread
From: James Carter @ 2022-03-11 16:02 UTC (permalink / raw)
To: Ondrej Mosnacek; +Cc: Petr Lautrbach, SElinux list
On Wed, Mar 2, 2022 at 7:21 PM Ondrej Mosnacek <omosnace@redhat.com> wrote:
>
> On Fri, Feb 18, 2022 at 10:21 AM Petr Lautrbach <plautrba@redhat.com> 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@redhat.com>
> > ---
> >
> > - 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@redhat.com>
>
Applied (without the extra space)
Thanks,
Jim
> --
> Ondrej Mosnacek
> Software Engineer, Linux Security - SELinux kernel
> Red Hat, Inc.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-11 16:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-16 17:49 [PATCH] policycoreutils/fixfiles: Use parallel relabeling Petr Lautrbach
2022-02-17 14:00 ` Ondrej Mosnacek
2022-02-18 9:20 ` [PATCH v2] " Petr Lautrbach
2022-03-02 16:20 ` Ondrej Mosnacek
2022-03-11 16:02 ` James Carter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).