chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f9c883
)
Rename systemd-logind to logind.
author
Ricardo Wurmus
<rekado@elephly.net>
Sun, 3 May 2015 20:26:52 +0000
(22:26 +0200)
committer
Andy Wingo
<wingo@pobox.com>
Sat, 15 Aug 2015 20:14:07 +0000
(22:14 +0200)
man/loginctl.xml
patch
|
blob
|
history
man/logind.conf.xml
patch
|
blob
|
history
man/logind.xml
patch
|
blob
|
history
man/sd-login.xml
patch
|
blob
|
history
src/login/logind-session.c
patch
|
blob
|
history
src/login/logind.c
patch
|
blob
|
history
src/login/pam_elogind.c
patch
|
blob
|
history
diff --git
a/man/loginctl.xml
b/man/loginctl.xml
index b93ba80de5d44768423db0262af8d6956f5e831f..4e09e7a1c07eea96704180172c029607118a8364 100644
(file)
--- a/
man/loginctl.xml
+++ b/
man/loginctl.xml
@@
-63,7
+63,7
@@
control the state of the
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
login manager
control the state of the
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
login manager
- <citerefentry><refentrytitle>
systemd-
logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+ <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
</refsect1>
<refsect1>
</refsect1>
<refsect1>
@@
-406,7
+406,7
@@
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>
systemd-
logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
<citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
diff --git
a/man/logind.conf.xml
b/man/logind.conf.xml
index 2e22e5cc95367109079565045497d85f85114bde..6d3b355e837e17d38a6ad7931d01dddbf9b03b82 100644
(file)
--- a/
man/logind.conf.xml
+++ b/
man/logind.conf.xml
@@
-59,7
+59,7
@@
<para>These files configure various parameters of the systemd
login manager,
<para>These files configure various parameters of the systemd
login manager,
- <citerefentry><refentrytitle>
systemd-
logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+ <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
</para>
</refsect1>
</para>
</refsect1>
@@
-300,7
+300,7
@@
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>
systemd-
logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
<citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
diff --git
a/man/logind.xml
b/man/logind.xml
index da0bd7a0c50e5a61fd416f6d346d2f4202c6cabe..7afacbf3450203e2c98a02af2126e59a2df5d3d4 100644
(file)
--- a/
man/logind.xml
+++ b/
man/logind.xml
@@
-21,10
+21,10
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="
systemd-
logind.service">
+<refentry id="logind.service">
<refentryinfo>
<refentryinfo>
- <title>
systemd-
logind.service</title>
+ <title>logind.service</title>
<productname>systemd</productname>
<authorgroup>
<productname>systemd</productname>
<authorgroup>
@@
-38,25
+38,25
@@
</refentryinfo>
<refmeta>
</refentryinfo>
<refmeta>
- <refentrytitle>
systemd-
logind.service</refentrytitle>
+ <refentrytitle>logind.service</refentrytitle>
<manvolnum>8</manvolnum>
</refmeta>
<refnamediv>
<manvolnum>8</manvolnum>
</refmeta>
<refnamediv>
- <refname>
systemd-
logind.service</refname>
- <refname>
systemd-
logind</refname>
+ <refname>logind.service</refname>
+ <refname>logind</refname>
<refpurpose>Login manager</refpurpose>
</refnamediv>
<refsynopsisdiv>
<refpurpose>Login manager</refpurpose>
</refnamediv>
<refsynopsisdiv>
- <para><filename>
systemd-
logind.service</filename></para>
- <para><filename>/usr/lib/systemd/
systemd-
logind</filename></para>
+ <para><filename>logind.service</filename></para>
+ <para><filename>/usr/lib/systemd/logind</filename></para>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
- <para><command>
systemd-
logind</command> is a system service that
+ <para><command>logind</command> is a system service that
manages user logins. It is responsible for:</para>
<itemizedlist>
manages user logins. It is responsible for:</para>
<itemizedlist>
@@
-100,7
+100,7
@@
<para>See the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/logind">
logind D-Bus API Documentation</ulink> for information about the
<para>See the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/logind">
logind D-Bus API Documentation</ulink> for information about the
- APIs <filename>
systemd-
logind</filename> provides.</para>
+ APIs <filename>logind</filename> provides.</para>
<para>For more information on the inhibition logic see the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor
<para>For more information on the inhibition logic see the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor
diff --git
a/man/sd-login.xml
b/man/sd-login.xml
index da873b7e81e1797025f83b2087d9bd332772ba9d..06ffc6906ffe14c54408f31d34f2724a1f30dd93 100644
(file)
--- 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
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.</para>
+ logind, instead.</para>
<para>These functions synchronously access data in
<filename>/proc</filename>, <filename>/sys/fs/cgroup</filename>
<para>These functions synchronously access data in
<filename>/proc</filename>, <filename>/sys/fs/cgroup</filename>
@@
-85,7
+85,7
@@
<para>It is possible (and often a very good choice) to mix calls
to the synchronous interface of <filename>sd-login.h</filename>
<para>It is possible (and often a very good choice) to mix calls
to the synchronous interface of <filename>sd-login.h</filename>
- 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
<filename>sd-login.h</filename> interfaces such as the login
if this is done you need to think a bit about possible races since
the stream of events from D-Bus and from
<filename>sd-login.h</filename> interfaces such as the login
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index 59f765782a668e5d92f188032ec5a848aa79dc11..d9167197e0859286cb9b5eaa47f863bd1c5cb650 100644
(file)
--- 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();
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);
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 e7880743a0657566c5ceea18cbb56c31ee627ff3..efc37a12eeb60fcf6f866a9bd7531c45b3b847ce 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-1170,7
+1170,7
@@
int main(int argc, char *argv[]) {
goto finish;
}
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"
sd_notify(false,
"READY=1\n"
@@
-1178,7
+1178,7
@@
int main(int argc, char *argv[]) {
r = manager_run(m);
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,
finish:
sd_notify(false,
diff --git
a/src/login/pam_elogind.c
b/src/login/pam_elogind.c
index d7a708fd0a8e05ebb7c964ef5c80d0dad8c22bdc..b0bc47130d0a862e23692a658892ea7ea19fbf3e 100644
(file)
--- 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
}
/* 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. */
* background to finish start-up. If the service is
* "systemd-user" we simply set XDG_RUNTIME_DIR and
* leave. */