summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2015-05-03 22:26:52 +0200
committerAndy Wingo <wingo@pobox.com>2015-08-15 22:14:07 +0200
commitf52715f8d90ca768dc06616c0f77b11db9fa3236 (patch)
tree41f6a288bc1fc1264000bb01e4c006b11c6a6538 /src/login
parent0f9c883e1a889c3f45671d45fe9bce607e459bc1 (diff)
Rename systemd-logind to logind.
Diffstat (limited to 'src/login')
-rw-r--r--src/login/logind-session.c2
-rw-r--r--src/login/logind.c4
-rw-r--r--src/login/pam_elogind.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 59f765782a..d9167197e0 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 e7880743a0..efc37a12ee 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 d7a708fd0a..b0bc47130d 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. */