From f52715f8d90ca768dc06616c0f77b11db9fa3236 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 3 May 2015 22:26:52 +0200 Subject: [PATCH] Rename systemd-logind to logind. --- man/loginctl.xml | 4 ++-- man/logind.conf.xml | 4 ++-- man/logind.xml | 18 +++++++++--------- man/sd-login.xml | 4 ++-- src/login/logind-session.c | 2 +- src/login/logind.c | 4 ++-- src/login/pam_elogind.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/man/loginctl.xml b/man/loginctl.xml index b93ba80de..4e09e7a1c 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -63,7 +63,7 @@ control the state of the systemd1 login manager - systemd-logind.service8. + logind.service8. @@ -406,7 +406,7 @@ systemd1, systemctl1, - systemd-logind.service8, + logind.service8, logind.conf5 diff --git a/man/logind.conf.xml b/man/logind.conf.xml index 2e22e5cc9..6d3b355e8 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -59,7 +59,7 @@ These files configure various parameters of the systemd login manager, - systemd-logind.service8. + logind.service8. @@ -300,7 +300,7 @@ See Also systemd1, - systemd-logind.service8, + logind.service8, loginctl1, systemd-system.conf5 diff --git a/man/logind.xml b/man/logind.xml index da0bd7a0c..7afacbf34 100644 --- a/man/logind.xml +++ b/man/logind.xml @@ -21,10 +21,10 @@ along with systemd; If not, see . --> - + - systemd-logind.service + logind.service systemd @@ -38,25 +38,25 @@ - systemd-logind.service + logind.service 8 - systemd-logind.service - systemd-logind + logind.service + logind Login manager - systemd-logind.service - /usr/lib/systemd/systemd-logind + logind.service + /usr/lib/systemd/logind Description - systemd-logind is a system service that + logind is a system service that manages user logins. It is responsible for: @@ -100,7 +100,7 @@ See the logind D-Bus API Documentation for information about the - APIs systemd-logind provides. + APIs logind provides. For more information on the inhibition logic see the Inhibitor diff --git a/man/sd-login.xml b/man/sd-login.xml index da873b7e8..06ffc6906 100644 --- a/man/sd-login.xml +++ b/man/sd-login.xml @@ -75,7 +75,7 @@ monitoring of seats, sessions and users. To actively make changes to the seat configuration, terminate login sessions, or switch session on a seat you need to utilize the D-Bus API of - systemd-logind, instead. + logind, instead. These functions synchronously access data in /proc, /sys/fs/cgroup @@ -85,7 +85,7 @@ It is possible (and often a very good choice) to mix calls to the synchronous interface of sd-login.h - with the asynchronous D-Bus interface of systemd-logind. However, + with the asynchronous D-Bus interface of logind. However, if this is done you need to think a bit about possible races since the stream of events from D-Bus and from sd-login.h interfaces such as the login diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 59f765782..d9167197e 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -511,7 +511,7 @@ static int session_start_scope(Session *s) { if (!scope) return log_oom(); - r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-sessions.service", &error, &job); + r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "logind.service", "systemd-user-sessions.service", &error, &job); if (r < 0) { log_error("Failed to start session scope %s: %s %s", scope, bus_error_message(&error, r), error.name); diff --git a/src/login/logind.c b/src/login/logind.c index e7880743a..efc37a12e 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -1170,7 +1170,7 @@ int main(int argc, char *argv[]) { goto finish; } - log_debug("systemd-logind running as pid "PID_FMT, getpid()); + log_debug("logind running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -1178,7 +1178,7 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("systemd-logind stopped as pid "PID_FMT, getpid()); + log_debug("logind stopped as pid "PID_FMT, getpid()); finish: sd_notify(false, diff --git a/src/login/pam_elogind.c b/src/login/pam_elogind.c index d7a708fd0..b0bc47130 100644 --- a/src/login/pam_elogind.c +++ b/src/login/pam_elogind.c @@ -241,7 +241,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( } /* Make sure we don't enter a loop by talking to - * systemd-logind when it is actually waiting for the + * logind when it is actually waiting for the * background to finish start-up. If the service is * "systemd-user" we simply set XDG_RUNTIME_DIR and * leave. */ -- 2.30.2