firstboot: Check if the given shell exists

[thirdparty/systemd.git] / units / getty@.service.m4

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index c2665e3f6b67b7207b312ac2432eff0c95556d3b..087d68666605047678ad3b34caa34496ed41585a 100644 (file)
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -1,3 +1,5 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
@@ -23,8 +25,8 @@ IgnoreOnIsolate=yes
 # IgnoreOnIsolate causes issues with sulogin, if someone isolates
 # rescue.target or starts rescue.service from multi-user.target or
 # graphical.target.
-Conflicts=rescue.service emergency.service
-Before=rescue.service emergency.service
+Conflicts=rescue.service
+Before=rescue.service
 
 # On systems without virtual consoles, don't start any getty. Note
 # that serial gettys are covered by serial-getty@.service, not this
@@ -45,7 +47,9 @@ TTYPath=/dev/%I
 TTYReset=yes
 TTYVHangup=yes
 TTYVTDisallocate=yes
+m4_ifdef(`ENABLE_LOGIND',,
 KillMode=process
+)m4_dnl
 IgnoreSIGPIPE=no
 SendSIGHUP=yes