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 234e4e7572b9d044a2b0a024175bd408a89fce26..984ebf282ad98f28d1a79b1f238976cf4ae0c118 100644 (file)
--- 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