hooks: second try at moving pam.d files - moving the common-* ones se…

…emed to break things, experimenting now
canonical · Nov 7, 2024 · 171bd9a · 171bd9a
1 parent 57146e1
commit 171bd9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/hook-tests/031-faillock.test b/hook-tests/031-faillock.test
@@ -2,5 +2,4 @@
 
 set -eu
 
-# the pam.d files should now be in usr/lib/pam.d
-grep pam_faillock.so usr/lib/pam.d/common-auth
+grep pam_faillock.so etc/pam.d/common-auth
diff --git a/hooks/900-cleanup-etc-var.chroot b/hooks/900-cleanup-etc-var.chroot
@@ -21,7 +21,7 @@ rm /etc/debian_version
 # pam stuff, move pam.d files into /usr/lib/pam.d instead of
 # /etc/pam.d to allow snaps to mount their own pam.d files as well
 rm /etc/pam.conf
-mv /etc/pam.d/* /usr/lib/pam.d
+find /etc/pam.d/ -type f ! -name "common-*" -exec mv {} /usr/lib/pam.d \;
 
 # cloud-init adds stuff here
 rm -rvf /etc/profile.d/Z99-cloud*