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

diff --git a/Makefile.am b/Makefile.am
index f6d3445690c219029c2f106dde28d4069b6d7f93..7f8e22a6a3d589246097307556bbc2cad8b1274b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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\" \
        -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)\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \

diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 43d239f491223b7905f3b6056bc6a92a1d47f236..11852eb02c50c69b880874874666cbaed2a24b79 100644 (file)
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -65,7 +65,7 @@
                 <orderedlist>
                         <listitem><para>If it does not exist yet, the
                         user runtime directory
                 <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>
 
                         created and its ownership changed to the user
                         that is logging in.</para></listitem>
 

diff --git a/man/systemd.xml b/man/systemd.xml
index 5a4c4ab9c5ca682ad0054a0772e181d10ecc0e1c..a7dc4530ed6aaf20342850662c672bc17b593da0 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1024,20 +1024,19 @@
 
                 <variablelist>
                         <varlistentry>
 
                 <variablelist>
                         <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
-                                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>
                                 <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>
 
                                 <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
                                 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>
                         </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
 
                                 <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>
                         </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
 
                                 <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>
 
                                 projects.</para></listitem>
                         </varlistentry>
 

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 868b57e93517feab6b74c6d2f6ea8629a24f2269..8568fcd59c5635567c98815a530c16c5e633d6cc 100644 (file)
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -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
                <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>
                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
                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>
 
                 <refsect2>
                         <title>Type</title>

diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
index 4f89a3e6d8bb8f1c70052fe32b12736e82e03110..2bfc6a9c83a55ea346e2e84f3bce870faa2adb5b 100644 (file)
--- a/src/gnome-ask-password-agent.vala
+++ b/src/gnome-ask-password-agent.vala
@@ -91,7 +91,7 @@ public class MyStatusIcon : StatusIcon {
                 GLib.Object(icon_name : "dialog-password");
                 set_title("System Password Request");
 
                 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);
 
                 file_monitor = directory.monitor_directory(0);
                 file_monitor.changed.connect(file_monitor_changed);
 

diff --git a/src/pam-module.c b/src/pam-module.c
index 3a5404db4d685168e1dcbe0a96cbd255086399db..6486546e6dea0a5fddab5976424eb06bed8cac08 100644 (file)
--- a/src/pam-module.c
+++ b/src/pam-module.c
@@ -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
                 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;
 
                 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;
         }
 
                 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;
         free(buf);
         if (asprintf(&buf, RUNTIME_DIR "/user/%s", username) < 0) {
                 r = PAM_BUF_ERR;

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 68af37aab0eb43f27edb0fb3062a0ff08cbebb3d..e92b1123c67f77d7ff9dea5896465378e8e3f076 100644 (file)
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -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
 
 /* 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. */
 
  * /var/lock which are volatile and hence need to be recreated on
  * bootup. */