auto-getty: rework auto console getty logic to work in conjunction with single user mode

5 files changed, 20 insertions, 4 deletions

diff --git a/units/systemd-auto-console-getty.service.in b/units/systemd-auto-console-getty.service.in
new file mode 100644
index 0000000000..6542cab18a
--- /dev/null
+++ b/units/systemd-auto-console-getty.service.in
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Automatically Spawn getty on Kernel Console
+
+[Service]
+Type=oneshot
+ExecStart=@rootlibexecdir@/systemd-auto-console-getty
+
+[Install]
+WantedBy=getty.target
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index 4d5841d6f5..965da06901 100644
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -14,7 +14,7 @@ Before=shutdown.target
 
 [Service]
 Type=oneshot
-ExecStart=-@rootlibexecdir@/systemd-random-seed load
+ExecStart=@rootlibexecdir@/systemd-random-seed load
 
 [Install]
 WantedBy=sysinit.target
diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in
index 654c859e22..70cb31d491 100644
--- a/units/systemd-random-seed-save.service.in
+++ b/units/systemd-random-seed-save.service.in
@@ -13,7 +13,7 @@ Conflicts=systemd-random-seed-save.service
 
 [Service]
 Type=oneshot
-ExecStart=-@rootlibexecdir@/systemd-random-seed save
+ExecStart=@rootlibexecdir@/systemd-random-seed save
 
 [Install]
 WantedBy=shutdown.target
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 0b4c83dd86..a288d6eb21 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -14,4 +14,4 @@ Before=shutdown.target
 
 [Service]
 Type=oneshot
-ExecStart=-@rootlibexecdir@/systemd-update-utmp runlevel
+ExecStart=@rootlibexecdir@/systemd-update-utmp runlevel
diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
index 4c48c8b53a..e071285e3a 100644
--- a/units/systemd-update-utmp-shutdown.service.in
+++ b/units/systemd-update-utmp-shutdown.service.in
@@ -13,4 +13,4 @@ Conflicts=systemd-update-utmp-runlevel.service
 
 [Service]
 Type=oneshot
-ExecStart=-@rootlibexecdir@/systemd-update-utmp shutdown
+ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown