From 86f4cd428f17b5f7f089d5665780946b99bec5d0 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 4 May 2018 09:11:12 -0700 Subject: [PATCH] initrd-setup-root: Prosess all tmpfile configs All build targets should now have the same tmpfile configs, so remove the conditional processing. libsemanage.conf now creates the directory it needs, so remove the comment here regarding a dependency on selinux-base.conf. Signed-off-by: Geoff Levand --- dracut/99setup-root/initrd-setup-root | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dracut/99setup-root/initrd-setup-root b/dracut/99setup-root/initrd-setup-root index 2499b46..f71923f 100755 --- a/dracut/99setup-root/initrd-setup-root +++ b/dracut/99setup-root/initrd-setup-root @@ -9,15 +9,8 @@ MACHINE_ID_FILE="/sysroot/etc/machine-id" # Initialize base filesystem systemd-tmpfiles --root=/sysroot --create \ baselayout.conf baselayout-etc.conf baselayout-usr.conf \ - baselayout-home.conf etc.conf etc-shadow.conf - -# Not all images provide these files so check before using them. -# Note: selinux-base.conf must run before libsemanage.conf -for config in baselayout-ldso.conf selinux-base.conf libsemanage.conf; do - if [ -e "/sysroot/usr/lib/tmpfiles.d/${config}" ]; then - systemd-tmpfiles --root=/sysroot --create "${config}" - fi -done + baselayout-home.conf etc.conf etc-shadow.conf selinux-base.conf \ + libsemanage.conf # This creates the modifiable users/groups in /sysroot/etc, # initializing the shadow database in the process.