From d1f9edafe7b832c507931640f32069d001916b0e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 2 Jul 2012 14:33:04 +0200 Subject: units: rename systemd-debug-shell.service to debug-shell.service The systemd- prefix for services should be reserved only for services that invoke our own code rather than generic, external code. --- Makefile.am | 4 ++-- NEWS | 2 +- po/POTFILES.skip | 2 +- units/.gitignore | 2 +- units/debug-shell.service.in | 33 +++++++++++++++++++++++++++++++++ units/systemd-debug-shell.service.in | 33 --------------------------------- 6 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 units/debug-shell.service.in delete mode 100644 units/systemd-debug-shell.service.in diff --git a/Makefile.am b/Makefile.am index 616f99853e..370ee2e648 100644 --- a/Makefile.am +++ b/Makefile.am @@ -343,7 +343,7 @@ nodist_systemunit_DATA = \ units/systemd-udev.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ - units/systemd-debug-shell.service + units/debug-shell.service dist_userunit_DATA = \ units/user/default.target \ @@ -381,7 +381,7 @@ EXTRA_DIST += \ units/systemd-udev.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ - units/systemd-debug-shell.service.in \ + units/debug-shell.service.in \ units/systemd-hibernate.service.in \ units/systemd-suspend.service.in \ introspect.awk \ diff --git a/NEWS b/NEWS index a87bae2fb7..6f4afd3d2b 100644 --- a/NEWS +++ b/NEWS @@ -14,7 +14,7 @@ CHANGES WITH 186: * We now provide an early debug shell on tty9 if this enabled. Use: - systemctl enable systemd-debug-shell.service + systemctl enable debug-shell.service * All plymouth related units have been moved into the Plymouth package. Please make sure to upgrade your Plymouth version diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 40584d4077..52a9be84ce 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -17,4 +17,4 @@ src/core/org.freedesktop.systemd1.policy.in.in src/timedate/timedated.c units/systemd-readahead-done.service.in units/user@.service.in -units/systemd-debug-shell.service.in +units/debug-shell.service.in diff --git a/units/.gitignore b/units/.gitignore index 2193bedf61..3e434fe9e3 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -42,4 +42,4 @@ /systemd-udev-settle.service /systemd-udev-trigger.service /systemd-udev.service -/systemd-debug-shell.service +/debug-shell.service diff --git a/units/debug-shell.service.in b/units/debug-shell.service.in new file mode 100644 index 0000000000..2aa98d3cc5 --- /dev/null +++ b/units/debug-shell.service.in @@ -0,0 +1,33 @@ +# 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=Early root shell on tty9 FOR DEBUGGING ONLY +Documentation=man:sushell(8) +DefaultDependencies=no +IgnoreOnIsolate=yes + +[Service] +Environment=TERM=linux +ExecStart=@sushell@ +Restart=always +RestartSec=0 +StandardInput=tty +TTYPath=/dev/tty9 +TTYReset=yes +TTYVHangup=yes +KillMode=process +IgnoreSIGPIPE=no +# bash ignores SIGTERM +KillSignal=SIGHUP + +# Unset locale for the console getty since the console has problems +# displaying some internationalized messages. +Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= + +[Install] +WantedBy=sysinit.target diff --git a/units/systemd-debug-shell.service.in b/units/systemd-debug-shell.service.in deleted file mode 100644 index 2aa98d3cc5..0000000000 --- a/units/systemd-debug-shell.service.in +++ /dev/null @@ -1,33 +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=Early root shell on tty9 FOR DEBUGGING ONLY -Documentation=man:sushell(8) -DefaultDependencies=no -IgnoreOnIsolate=yes - -[Service] -Environment=TERM=linux -ExecStart=@sushell@ -Restart=always -RestartSec=0 -StandardInput=tty -TTYPath=/dev/tty9 -TTYReset=yes -TTYVHangup=yes -KillMode=process -IgnoreSIGPIPE=no -# bash ignores SIGTERM -KillSignal=SIGHUP - -# Unset locale for the console getty since the console has problems -# displaying some internationalized messages. -Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= - -[Install] -WantedBy=sysinit.target -- cgit v1.2.3-54-g00ecf