mirror of
https://github.com/systemd/systemd.git
synced 2025-02-03 17:47:28 +03:00
general: replace a few uses of /var/run by /run
This commit is contained in:
parent
a9f470b802
commit
bb29785e0d
@ -59,7 +59,7 @@ AM_CPPFLAGS = \
|
|||||||
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
|
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
|
||||||
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
|
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
|
||||||
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
|
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
|
||||||
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
|
-DRUNTIME_DIR=\"/run\" \
|
||||||
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
|
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
|
||||||
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
|
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
|
||||||
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
|
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
<orderedlist>
|
<orderedlist>
|
||||||
<listitem><para>If it does not exist yet, the
|
<listitem><para>If it does not exist yet, the
|
||||||
user runtime directory
|
user runtime directory
|
||||||
<filename>/var/run/user/$USER</filename> is
|
<filename>/run/user/$USER</filename> is
|
||||||
created and its ownership changed to the user
|
created and its ownership changed to the user
|
||||||
that is logging in.</para></listitem>
|
that is logging in.</para></listitem>
|
||||||
|
|
||||||
|
@ -1024,20 +1024,19 @@
|
|||||||
|
|
||||||
<variablelist>
|
<variablelist>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><filename>/var/run/systemd/notify</filename></term>
|
<term><filename>/run/systemd/notify</filename></term>
|
||||||
|
|
||||||
<listitem><para>Daemon status
|
<listitem><para>Daemon status
|
||||||
notification socket. This is an AF_UNIX
|
notification socket. This is an
|
||||||
datagram socket in the Linux abstract
|
AF_UNIX datagram socket and is used to
|
||||||
namespace, and is used to implement
|
implement the daemon notification
|
||||||
the daemon notification logic as
|
logic as implemented by
|
||||||
implemented by
|
|
||||||
<citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
|
<citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
|
||||||
|
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><filename>/var/run/systemd/logger</filename></term>
|
<term><filename>/run/systemd/logger</filename></term>
|
||||||
|
|
||||||
<listitem><para>Used internally by the
|
<listitem><para>Used internally by the
|
||||||
<filename>systemd-logger.service</filename>
|
<filename>systemd-logger.service</filename>
|
||||||
@ -1045,32 +1044,30 @@
|
|||||||
of spawned processes to
|
of spawned processes to
|
||||||
<citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
|
<citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
|
||||||
or the kernel log buffer. This is an
|
or the kernel log buffer. This is an
|
||||||
AF_UNIX stream socket in the Linux
|
AF_UNIX stream
|
||||||
abstract namespace.</para></listitem>
|
socket.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><filename>/var/run/systemd/shutdownd</filename></term>
|
<term><filename>/run/systemd/shutdownd</filename></term>
|
||||||
|
|
||||||
<listitem><para>Used internally by the
|
<listitem><para>Used internally by the
|
||||||
<citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
<citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||||
tool to implement delayed
|
tool to implement delayed
|
||||||
shutdowns. This is an AF_UNIX datagram
|
shutdowns. This is an AF_UNIX datagram
|
||||||
socket in the Linux abstract
|
socket.</para></listitem>
|
||||||
namespace.</para></listitem>
|
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><filename>/var/run/systemd/private</filename></term>
|
<term><filename>/run/systemd/private</filename></term>
|
||||||
|
|
||||||
<listitem><para>Used internally as
|
<listitem><para>Used internally as
|
||||||
communication channel between
|
communication channel between
|
||||||
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||||
and the systemd process. This is an
|
and the systemd process. This is an
|
||||||
AF_UNIX stream socket in the Linux
|
AF_UNIX stream socket. This interface
|
||||||
abstract namespace. This interface is
|
is private to systemd and should not
|
||||||
private to systemd and should not be
|
be used in external
|
||||||
used in external
|
|
||||||
projects.</para></listitem>
|
projects.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
<filename>/etc/tmpfiles.d/</filename> to describe the
|
<filename>/etc/tmpfiles.d/</filename> to describe the
|
||||||
creation, cleaning and removal of volatile and
|
creation, cleaning and removal of volatile and
|
||||||
temporary files and directories which usually reside
|
temporary files and directories which usually reside
|
||||||
in directories such as <filename>/var/run</filename>
|
in directories such as <filename>/run</filename>
|
||||||
or <filename>/tmp</filename>. Each configuration file
|
or <filename>/tmp</filename>. Each configuration file
|
||||||
is named in the style of
|
is named in the style of
|
||||||
<filename>/etc/tmpfiles.d/<program>.conf</filename>.</para>
|
<filename>/etc/tmpfiles.d/<program>.conf</filename>.</para>
|
||||||
@ -72,7 +72,7 @@
|
|||||||
fields:</para>
|
fields:</para>
|
||||||
|
|
||||||
<programlisting>Type Path Mode UID GID Age
|
<programlisting>Type Path Mode UID GID Age
|
||||||
d /var/run/user 0755 root root 10d</programlisting>
|
d /run/user 0755 root root 10d</programlisting>
|
||||||
|
|
||||||
<refsect2>
|
<refsect2>
|
||||||
<title>Type</title>
|
<title>Type</title>
|
||||||
|
@ -91,7 +91,7 @@ public class MyStatusIcon : StatusIcon {
|
|||||||
GLib.Object(icon_name : "dialog-password");
|
GLib.Object(icon_name : "dialog-password");
|
||||||
set_title("System Password Request");
|
set_title("System Password Request");
|
||||||
|
|
||||||
directory = File.new_for_path("/var/run/systemd/ask-password/");
|
directory = File.new_for_path("/run/systemd/ask-password/");
|
||||||
file_monitor = directory.monitor_directory(0);
|
file_monitor = directory.monitor_directory(0);
|
||||||
file_monitor.changed.connect(file_monitor_changed);
|
file_monitor.changed.connect(file_monitor_changed);
|
||||||
|
|
||||||
|
@ -239,11 +239,10 @@ static uint64_t get_session_id(int *mode) {
|
|||||||
ssize_t r;
|
ssize_t r;
|
||||||
|
|
||||||
/* We do a bit of endianess swapping here, just to be
|
/* We do a bit of endianess swapping here, just to be
|
||||||
* sure. /var should be machine specific anyway, and
|
* sure. /run should be machine specific anyway, and
|
||||||
* /var/run even mounted from tmpfs, so this
|
* even mounted from tmpfs, so this byteswapping
|
||||||
* byteswapping should really not be necessary. But
|
* should really not be necessary. But then again, you
|
||||||
* then again, you never know, so let's avoid any
|
* never know, so let's avoid any risk. */
|
||||||
* risk. */
|
|
||||||
|
|
||||||
if (loop_read(fd, &counter, sizeof(counter), false) != sizeof(counter))
|
if (loop_read(fd, &counter, sizeof(counter), false) != sizeof(counter))
|
||||||
counter = 1;
|
counter = 1;
|
||||||
@ -435,7 +434,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
|
|||||||
goto finish;
|
goto finish;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create /var/run/$USER */
|
/* Create /run/user/$USER */
|
||||||
free(buf);
|
free(buf);
|
||||||
if (asprintf(&buf, RUNTIME_DIR "/user/%s", username) < 0) {
|
if (asprintf(&buf, RUNTIME_DIR "/user/%s", username) < 0) {
|
||||||
r = PAM_BUF_ERR;
|
r = PAM_BUF_ERR;
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
/* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
|
/* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
|
||||||
* them in the file system. This is intended to be used to create
|
* them in the file system. This is intended to be used to create
|
||||||
* properly owned directories beneath /tmp, /var/tmp, /var/run and
|
* properly owned directories beneath /tmp, /var/tmp, /run and
|
||||||
* /var/lock which are volatile and hence need to be recreated on
|
* /var/lock which are volatile and hence need to be recreated on
|
||||||
* bootup. */
|
* bootup. */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user