slices/libpam-runtime: slice fixups, linting fixes

slices/libpam-modules.yaml

@@ -9,8 +9,8 @@ slices:
       /etc/security/limits.conf:
       /etc/security/limits.d/:
       /etc/security/namespace.conf:
-      /etc/security/namespace.init:
       /etc/security/namespace.d/:
+      /etc/security/namespace.init:
       /etc/security/pam_env.conf:
       /etc/security/sepermit.conf:
       /etc/security/time.conf:

slices/libpam-runtime.yaml

@@ -14,9 +14,9 @@ slices:
     contents:
       /etc/pam.conf:
       /etc/pam.d/other:
-  
+
   # folders expected by libpam to exist
-  folders:
+  var:
     contents:
       /var/lib/pam/:
 
@@ -26,10 +26,10 @@ slices:
   pam-config:
     contents:
       /usr/share/pam-configs/unix:
-  
+
   # default templates for the /etc/pam.d files that are used by
   # pam-auth-update to generate the /etc/pam.d versions based on
-  # additional plugs in /usr/share/pam-configs/*. 
+  # additional plugs in /usr/share/pam-configs/*.
   pam-defaults:
     contents:
       /usr/share/pam/common-account:
@@ -49,12 +49,12 @@ slices:
   core:
     essential:
       - libpam-runtime_config
-      - libpam-runtime_folders
+      - libpam-runtime_var
 
   standard:
     essential:
       - libpam-runtime_bins
       - libpam-runtime_config
-      - libpam-runtime_folders
-      - libpam-runtime_pam-defaults
       - libpam-runtime_pam-config
+      - libpam-runtime_pam-defaults
+      - libpam-runtime_var

slices/openssh-server.yaml

@@ -25,9 +25,9 @@ slices:
       - ucf_bins
       - zlib1g_libs
     contents:
-      /usr/sbin/sshd:
-      /usr/lib/openssh/ssh-session-cleanup:
       /etc/init.d/ssh:
+      /usr/lib/openssh/ssh-session-cleanup:
+      /usr/sbin/sshd:
 
   config:
     contents:

slices/openssh-sftp-server.yaml

@@ -11,5 +11,5 @@ slices:
 
   standard:
     essential:
-      - openssh-sftp-server_bins
       - openssh-client_standard
+      - openssh-sftp-server_bins

slices/procps.yaml

@@ -3,17 +3,17 @@ package: procps
 slices:
   bins:
     essential:
-      - libc6_libs
       - init-system-helpers_bins
+      - libc6_libs
       - libncursesw6_libs
       - libproc2-0_libs
       - libsystemd0_libs
       - libtinfo6_libs
     contents:
+      /etc/init.d/procps:
+      /usr/bin/free:
       /usr/bin/kill:
       /usr/bin/ps:
-      /usr/sbin/sysctl:
-      /usr/bin/free:
       /usr/bin/pgrep:
       /usr/bin/pidwait:
       /usr/bin/pkill:
@@ -28,7 +28,7 @@ slices:
       /usr/bin/vmstat:
       /usr/bin/w:
       /usr/bin/watch:
-      /etc/init.d/procps:
+      /usr/sbin/sysctl:
 
   config:
     contents:

slices/ucf.yaml

@@ -17,7 +17,7 @@ slices:
       /etc/ucf.conf:
       /var/lib/ucf/hashfile: {text: ""}
       /var/lib/ucf/registry: {text: ""}
-  
+
   standard:
     essential:
       - ucf_bins