From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 25 May 2023 11:36:17 +0000 (+0200)
Subject: units: order systemd-firstboot after systemd-tmpfiles-setup
X-Git-Tag: v254-rc1~360^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2ce20aa0cd632978fc7e1971fe83757eb8e7f4f;p=thirdparty%2Fsystemd.git

units: order systemd-firstboot after systemd-tmpfiles-setup

We may copy files from factory to /etc. The default mkosi config has
factory/etc/vconsole.conf. systemd-firstboot would race with tmpfiles-setup,
and sometimes ask for the keymap, and sometimes not.

I guess that if there are files in factory, we shouldn't ask the user for
the same configuration.
---

diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index 234e4e7572b..984ebf282ad 100644
--- a/units/systemd-firstboot.service
+++ b/units/systemd-firstboot.service
@@ -15,7 +15,7 @@ ConditionPathIsReadWrite=/etc
 ConditionFirstBoot=yes
 
 DefaultDependencies=no
-After=systemd-remount-fs.service systemd-sysusers.service
+After=systemd-remount-fs.service systemd-sysusers.service systemd-tmpfiles-setup.service
 Wants=first-boot-complete.target
 Before=first-boot-complete.target sysinit.target
 Conflicts=shutdown.target