shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

general: replace a few uses of /var/run by /run

Browse Source
This commit is contained in:
Lennart Poettering 2011-04-01 15:25:46 +02:00
parent a9f470b802
commit bb29785e0d
7 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -59,7 +59,7 @@ AM_CPPFLAGS = \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
-DRUNTIME_DIR=\"/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \

2
man/pam_systemd.xml
View File

@ -65,7 +65,7 @@
<orderedlist>
<listitem><para>If it does not exist yet, the
user runtime directory
<filename>/var/run/user/$USER</filename> is
<filename>/run/user/$USER</filename> is
created and its ownership changed to the user
that is logging in.</para></listitem>

31
man/systemd.xml
View File

@ -1024,20 +1024,19 @@
<variablelist>
<varlistentry>
<term><filename>/var/run/systemd/notify</filename></term>
<term><filename>/run/systemd/notify</filename></term>
<listitem><para>Daemon status
notification socket. This is an AF_UNIX
datagram socket in the Linux abstract
namespace, and is used to implement
the daemon notification logic as
implemented by
notification socket. This is an
AF_UNIX datagram socket and is used to
implement the daemon notification
logic as implemented by
<citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
</varlistentry>
<varlistentry>
<term><filename>/var/run/systemd/logger</filename></term>
<term><filename>/run/systemd/logger</filename></term>
<listitem><para>Used internally by the
<filename>systemd-logger.service</filename>
@ -1045,32 +1044,30 @@
of spawned processes to
<citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
or the kernel log buffer. This is an
AF_UNIX stream socket in the Linux
abstract namespace.</para></listitem>
AF_UNIX stream
socket.</para></listitem>
</varlistentry>
<varlistentry>
<term><filename>/var/run/systemd/shutdownd</filename></term>
<term><filename>/run/systemd/shutdownd</filename></term>
<listitem><para>Used internally by the
<citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>
tool to implement delayed
shutdowns. This is an AF_UNIX datagram
socket in the Linux abstract
namespace.</para></listitem>
socket.</para></listitem>
</varlistentry>
<varlistentry>
<term><filename>/var/run/systemd/private</filename></term>
<term><filename>/run/systemd/private</filename></term>
<listitem><para>Used internally as
communication channel between
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
and the systemd process. This is an
AF_UNIX stream socket in the Linux
abstract namespace. This interface is
private to systemd and should not be
used in external
AF_UNIX stream socket. This interface
is private to systemd and should not
be used in external
projects.</para></listitem>
</varlistentry>

4
man/tmpfiles.d.xml
View File

@ -58,7 +58,7 @@
<filename>/etc/tmpfiles.d/</filename> to describe the
creation, cleaning and removal of volatile and
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
is named in the style of
<filename>/etc/tmpfiles.d/&lt;program&gt;.conf</filename>.</para>
@ -72,7 +72,7 @@
fields:</para>
<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>
<title>Type</title>

2
src/gnome-ask-password-agent.vala
View File

@ -91,7 +91,7 @@ public class MyStatusIcon : StatusIcon {
GLib.Object(icon_name : "dialog-password");
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.changed.connect(file_monitor_changed);

11
src/pam-module.c
View File

@ -239,11 +239,10 @@ static uint64_t get_session_id(int *mode) {
ssize_t r;
/* We do a bit of endianess swapping here, just to be
* sure. /var should be machine specific anyway, and
* /var/run even mounted from tmpfs, so this
* byteswapping should really not be necessary. But
* then again, you never know, so let's avoid any
* risk. */
* sure. /run should be machine specific anyway, and
* even mounted from tmpfs, so this byteswapping
* should really not be necessary. But then again, you
* never know, so let's avoid any risk. */
if (loop_read(fd, &counter, sizeof(counter), false) != sizeof(counter))
counter = 1;
@ -435,7 +434,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
goto finish;
}
/* Create /var/run/$USER */
/* Create /run/user/$USER */
free(buf);
if (asprintf(&buf, RUNTIME_DIR "/user/%s", username) < 0) {
r = PAM_BUF_ERR;

2
src/tmpfiles.c
View File

@ -47,7 +47,7 @@
/* 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
* 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
* bootup. */