diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-02-25 20:11:04 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-02-25 20:41:24 -0500 |
| commit | 41a55c46ab8fb4ef6727434227071321fc762cce (patch) | |
| tree | 1253259a07b96b13342d097798de2d6e9c4a17c2 | |
| parent | f513e420c8b1a1d4c13092cd378f048b69793497 (diff) | |
| download | systemd-41a55c46ab8fb4ef6727434227071321fc762cce.tar.gz | |
Replace /var/run with /run in remaining places
/run was already used almost everywhere, fix the remaining places
for consistency.
| -rw-r--r-- | man/daemon.xml | 2 | ||||
| -rw-r--r-- | man/runlevel.xml | 2 | ||||
| -rw-r--r-- | man/tmpfiles.d.xml | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 4 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/man/daemon.xml b/man/daemon.xml index 88dd082a33..fd29ba722d 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -149,7 +149,7 @@ write the daemon PID (as returned by <function>getpid()</function>) to a PID file, for example - <filename>/var/run/foobar.pid</filename> + <filename>/run/foobar.pid</filename> (for a hypothetical daemon "foobar") to ensure that the daemon cannot be started more than once. This must be diff --git a/man/runlevel.xml b/man/runlevel.xml index 976753a737..4db06dc87c 100644 --- a/man/runlevel.xml +++ b/man/runlevel.xml @@ -124,7 +124,7 @@ <variablelist> <varlistentry> - <term><filename>/var/run/utmp</filename></term> + <term><filename>/run/utmp</filename></term> <listitem><para>The utmp database <command>runlevel</command> reads the diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index 812129f613..0a006d17ab 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -441,8 +441,8 @@ r! /tmp/.X[0-9]*-lock</programlisting> <title>/etc/tmpfiles.d/screen.conf example</title> <para><command>screen</command> needs two directories created at boot with specific modes and ownership.</para> - <programlisting>d /var/run/screens 1777 root root 10d -d /var/run/uscreens 0755 root root 10d12h</programlisting> + <programlisting>d /run/screens 1777 root root 10d +d /run/uscreens 0755 root root 10d12h</programlisting> </example> <example> <title>/etc/tmpfiles.d/abrt.conf example</title> diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 20f540df58..1318272085 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -794,8 +794,8 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) machine = NULL; b->sockaddr.un.sun_family = AF_UNIX; - strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/var/run/dbus/system_bus_socket") - 1; + strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); + b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/run/dbus/system_bus_socket"); return 0; } diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 34d7079299..869271628f 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -3758,8 +3758,8 @@ static int show_one( streq(verb, "status")) { /* According to LSB: "program not running" */ /* 0: program is running or service is OK - * 1: program is dead and /var/run pid file exists - * 2: program is dead and /var/lock lock file exists + * 1: program is dead and /run PID file exists + * 2: program is dead and /run/lock lock file exists * 3: program is not running * 4: program or service status is unknown */ |