| Message ID | 20210723095113.26189-1-jose.pekkarinen@unikie.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Remove deprecated matchpathcon calls | expand |
On Fri, 23 Jul 2021 12:51:13 +0300 José Pekkarinen <jose.pekkarinen@unikie.com> wrote: > This patch removes matchpathcon calls from > the auditd init script, removing some deprecated > warning in the init process. > > Signed-off-by: José Pekkarinen <jose.pekkarinen@unikie.com> > Change-Id: I22bdf73de732e9d107ec06a4b9434e70eec662a5 > --- > package/audit/S02auditd | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks for your patch! I've reworked a bit the commit log, and applied to master. Thomas
Hello José, On Tue, 27 Jul 2021 15:21:21 +0300 José Pekkarinen <jose.pekkarinen@unikie.com> wrote: > Thanks for quickly addressing this Thomas. If I may, as this is a > fix, is there any process to backport it to the stable versions? Perhaps > I have to resend it to the mailing list with another label? My customer > would be glad to take it from there. Our process to backport to stable versions is that Peter Korsgaard (one of the Buildroot co-maintainers) reviews the entire set of commits that go into master, and whenever a commit is a security bump or a fix, it gets backported to 2021.02.x. I have Cc'ed Peter on your request to make sure it is clear to him that commit 90dd1d6178b01f6da3e59e43d0c7efdf984a72d8 is a fix that should be backported to 2021.02.x. Best regards, Thomas
On Tue, Jul 27, 2021 at 3:43 PM Thomas Petazzoni < thomas.petazzoni@bootlin.com> wrote: > Hello José, > > On Tue, 27 Jul 2021 15:21:21 +0300 > José Pekkarinen <jose.pekkarinen@unikie.com> wrote: > > > Thanks for quickly addressing this Thomas. If I may, as this is a > > fix, is there any process to backport it to the stable versions? Perhaps > > I have to resend it to the mailing list with another label? My customer > > would be glad to take it from there. > > Our process to backport to stable versions is that Peter Korsgaard (one > of the Buildroot co-maintainers) reviews the entire set of commits that > go into master, and whenever a commit is a security bump or a fix, it > gets backported to 2021.02.x. > > I have Cc'ed Peter on your request to make sure it is clear to him that > commit 90dd1d6178b01f6da3e59e43d0c7efdf984a72d8 is a fix that should be > backported to 2021.02.x. > Fantastic! Thanks! José.
diff --git a/package/audit/S02auditd b/package/audit/S02auditd index 2ecf0f1df9..0eef881cee 100644 --- a/package/audit/S02auditd +++ b/package/audit/S02auditd @@ -18,9 +18,9 @@ start(){ # Create dir to store log files in if one doesn't exist. Create # the directory with SELinux permissions if possible - command -v matchpathcon >/dev/null 2>&1 + command -v selabel_lookup >/dev/null 2>&1 if [ $? = 0 ]; then - mkdir -p /var/log/audit -Z `matchpathcon -n /var/log/audit` + mkdir -p /var/log/audit -Z `selabel_lookup -b file -k /var/log/audit` else mkdir -p /var/log/audit fi
This patch removes matchpathcon calls from the auditd init script, removing some deprecated warning in the init process. Signed-off-by: José Pekkarinen <jose.pekkarinen@unikie.com> Change-Id: I22bdf73de732e9d107ec06a4b9434e70eec662a5 --- package/audit/S02auditd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)