]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test/test-functions: copy /usr/lib/pam.d into $initdir 17706/head
authorDan Streetman <ddstreet@canonical.com>
Fri, 20 Nov 2020 18:41:03 +0000 (13:41 -0500)
committerDan Streetman <ddstreet@canonical.com>
Mon, 23 Nov 2020 22:17:19 +0000 (17:17 -0500)
The systemd-user file has been moved from /etc/pam.d into /usr/lib/pam.d,
so test-functions needs to copy it from /usr/lib/pam.d instead.

This will copy it from either location.

test/test-functions

index a2cb28c3808ee28e2a80bfcc7189e73b9647a035..d5da8e0ea5e621d3078e8e3cd1ab1c5faa10c273 100644 (file)
@@ -1058,7 +1058,9 @@ install_pam() {
     else
         find /lib*/security -xtype f
     fi
-    find /etc/pam.d /etc/security -xtype f
+    for d in /etc/pam.d /etc/security /usr/lib/pam.d; do
+        [ -d "$d" ] && find $d -xtype f
+    done
     ) | while read file; do
         inst $file
     done
@@ -1067,9 +1069,6 @@ install_pam() {
     # see http://www.linux-pam.org/Linux-PAM-html/sag-pam_unix.html
     dracut_install -o unix_chkpwd
 
-    [[ "$LOOKS_LIKE_DEBIAN" ]] &&
-        cp /etc/pam.d/systemd-user $initdir/etc/pam.d/
-
     # set empty root password for easy debugging
     sed -i 's/^root:x:/root::/' $initdir/etc/passwd
 }