unit: drop console-shell.service (#4298) (#4325)

console-shell.service was supposed to be useful for normal clean boots
(i.e. multi-user.target or so), as a replacement for logind/getty@.service for
simpler use cases.

But due to the lack of documentation and sanity check one can easily be
confused and enable this service in // with getty@.service.

In this case we end up with both services sharing the same tty which ends up in
strange results.

Even worse, console-shell.service might be failing while getty@.service tries
to acquire the terminal which ends up in the system to poweroff since
console-shell.service uses:

  "ExecStopPost=-/usr/bin/systemctl poweroff".

Another issue: this service doesn't work well if plymouth is also used since it
lets the splash screen program run and mess the tty (at least a "plymouth quit"
is missing).

So let's kill it for now.

diff --git a/Makefile.am b/Makefile.am
index f7ae9ff7aa8d7e2919d14dc83e9b3484844852ea..b09b0cf1671c9674ca75ee4a3396dbd4f99c93e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -524,7 +524,6 @@ dist_systemunit_DATA_busnames += \
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
-       units/console-shell.service \
        units/console-getty.service \
        units/container-getty@.service \
        units/systemd-initctl.service \
@@ -587,7 +586,6 @@ dist_systempreset_DATA = \
 EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
-       units/console-shell.service.m4.in \
        units/console-getty.service.m4.in \
        units/container-getty@.service.m4.in \
        units/rescue.service.in \

diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset
index 0f494b75527ea137227a014d4f0f2d56a9113396..6b5349dc8df8e463266aa446695fe83bb18c09c3 100644 (file)
--- a/system-preset/90-systemd.preset
+++ b/system-preset/90-systemd.preset
@@ -18,7 +18,6 @@ enable systemd-resolved.service
 enable systemd-networkd-wait-online.service
 
 disable console-getty.service
-disable console-shell.service
 disable debug-shell.service
 
 disable halt.target

diff --git a/units/.gitignore b/units/.gitignore
index 47e99154ee8ef831641271477fe1f7bbe38731f6..8f4949258e80ec4e6f1c5197e8eb855c762803c5 100644 (file)
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,8 +1,6 @@
 /user@.service.m4
 /console-getty.service
 /console-getty.service.m4
-/console-shell.service
-/console-shell.service.m4
 /container-getty@.service
 /container-getty@.service.m4
 /debug-shell.service

diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
deleted file mode 100644 (file)
index a345ec2..0000000
--- a/units/console-shell.service.m4.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Console Shell
-Documentation=man:sulogin(8)
-After=systemd-user-sessions.service plymouth-quit-wait.service
-m4_ifdef(`HAVE_SYSV_COMPAT',
-After=rc-local.service
-)m4_dnl
-Before=getty.target
-
-[Service]
-Environment=HOME=/root
-WorkingDirectory=-/root
-ExecStart=-@SULOGIN@
-ExecStopPost=-@SYSTEMCTL@ poweroff
-Type=idle
-StandardInput=tty-force
-StandardOutput=inherit
-StandardError=inherit
-KillMode=process
-IgnoreSIGPIPE=no
-SendSIGHUP=yes
-
-[Install]
-WantedBy=getty.target