Merge pull request #27867 from keszybz/vconsole-reload-again

Restore ordering between vconsole-setup and firstboot services

units/systemd-firstboot.service

@@ -15,7 +15,14 @@ ConditionPathIsReadWrite=/etc
 ConditionFirstBoot=yes
 
 DefaultDependencies=no
-After=systemd-remount-fs.service systemd-sysusers.service systemd-tmpfiles-setup.service
+# This service may need to write to the file system:
+After=systemd-remount-fs.service
+# Both systemd-sysusers and systemd-tmpfiles may create the root account
+# (via factory files or credentials), obviating the need for us to do that:
+After=systemd-sysusers.service systemd-tmpfiles-setup.service
+# Let vconsole-setup do its setup before starting user interaction:
+After=systemd-vconsole-setup.service
+
 Wants=first-boot-complete.target
 Before=first-boot-complete.target sysinit.target
 Conflicts=shutdown.target

units/systemd-vconsole-setup.service.in

@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Setup Virtual Console
+Description=Virtual Console Setup
 Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5)
 
 ConditionPathExists=/dev/tty0
@@ -19,6 +19,12 @@ Before=initrd-switch-root.target shutdown.target
 
 [Service]
 Type=oneshot
+# This service will be restarted by udev whenever a new vtcon device appears.
+# If the previous instance is still running, it shall be interrupted without
+# error.
+SuccessExitStatus=SIGTERM
 RemainAfterExit=yes
+
 ExecStart={{ROOTLIBEXECDIR}}/systemd-vconsole-setup
+
 ImportCredential=vconsole.*