Skip to content

Commit 00b09ee

Browse files
authored
Merge pull request #73596 from 89luca89/fix/linux_pam_tmpfiles
fix: add tmpfiles for faillock dirs
2 parents 7bb32fa + eadbb7f commit 00b09ee

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

linux-pam.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package:
22
name: linux-pam
33
version: "1.7.1"
4-
epoch: 2
4+
epoch: 3
55
description: Linux PAM (Pluggable Authentication Modules for Linux)
66
copyright:
77
- license: BSD-3-Clause
8+
checks:
9+
disabled:
10+
- setuidgid
811
dependencies:
912
runtime:
1013
- merged-usrsbin
@@ -52,12 +55,16 @@ pipeline:
5255
done
5356
5457
# make "unix_chkpwd" shadow group and enable g+s
55-
chgrp shadow ${{targets.destdir}}/bin/unix_chkpwd \
56-
&& chmod g+s ${{targets.destdir}}/bin/unix_chkpwd
58+
chgrp shadow ${{targets.destdir}}/usr/bin/unix_chkpwd \
59+
&& chmod g+s ${{targets.destdir}}/usr/bin/unix_chkpwd
5760
5861
# Don't ship /var/run
5962
rm -r ${{targets.destdir}}/var/run
6063
64+
# Copy tmpfile template
65+
mkdir -p ${{targets.destdir}}/usr/lib/tmpfiles.d/
66+
mv pam-faillock.conf ${{targets.destdir}}/usr/lib/tmpfiles.d/
67+
6168
subpackages:
6269
- name: linux-pam-dev
6370
pipeline:

linux-pam/pam-faillock.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Create faillock directory with correct SELinux context
2+
d /var/log/faillock 0700 root root - -
3+
Z /var/log/faillock - - - - -

0 commit comments

Comments
 (0)