From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 8 Jun 2017 13:06:30 +0000 (+0200)
Subject: systemd: include systemd-tmpfiles-setup.service
X-Git-Tag: 046~60^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F235%2Fhead;p=thirdparty%2Fdracut.git

systemd: include systemd-tmpfiles-setup.service

... because otherwise nothing will actually
apply configuration from tmpfiles snippets
---

diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
index a38413f73..5da22a93b 100755
--- a/modules.d/00systemd/module-setup.sh
+++ b/modules.d/00systemd/module-setup.sh
@@ -77,6 +77,7 @@ install() {
         $systemdsystemunitdir/sys-kernel-config.mount \
         \
         $systemdsystemunitdir/kmod-static-nodes.service \
+        $systemdsystemunitdir/systemd-tmpfiles-setup.service \
         $systemdsystemunitdir/systemd-tmpfiles-setup-dev.service \
         $systemdsystemunitdir/systemd-ask-password-console.path \
         $systemdsystemunitdir/systemd-udevd-control.socket \
@@ -112,6 +113,7 @@ install() {
         $systemdsystemunitdir/sysinit.target.wants/systemd-udevd.service \
         $systemdsystemunitdir/sysinit.target.wants/systemd-udev-trigger.service \
         $systemdsystemunitdir/sysinit.target.wants/kmod-static-nodes.service \
+        $systemdsystemunitdir/sysinit.target.wants/systemd-tmpfiles-setup.service \
         $systemdsystemunitdir/sysinit.target.wants/systemd-tmpfiles-setup-dev.service \
         $systemdsystemunitdir/sysinit.target.wants/systemd-sysctl.service \
         \
@@ -194,6 +196,10 @@ install() {
     grep '^utmp:' /etc/group >> "$initdir/etc/group"
     grep '^root:' /etc/group >> "$initdir/etc/group"
 
+    # we don't use systemd-networkd, but the user is in systemd.conf tmpfiles snippet
+    grep '^systemd-network:' /etc/passwd 2>/dev/null >> "$initdir/etc/passwd"
+    grep '^systemd-network:' /etc/group >> "$initdir/etc/group"
+
     ln_r $systemdutildir/systemd "/init"
     ln_r $systemdutildir/systemd "/sbin/init"