[systemd-commits] 2 commits - man/systemd.service.xml src/readahead

Lennart Poettering lennart at kemper.freedesktop.org
Thu Jan 3 13:39:24 PST 2013


 man/systemd.service.xml          |   18 ++++++++++++------
 src/readahead/readahead-replay.c |    2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 1c981ff22e8a8ec04c2bbbe10aed0f3b4ff118bb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jan 3 22:37:38 2013 +0100

    readahead: don't complain that we cannot precache symlinks
    
    http://lists.freedesktop.org/archives/systemd-devel/2012-December/007847.html

diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c
index a1ac6b0..cb04e5f 100644
--- a/src/readahead/readahead-replay.c
+++ b/src/readahead/readahead-replay.c
@@ -64,7 +64,7 @@ static int unpack_file(FILE *pack) {
         fd = open(fn, O_RDONLY|O_CLOEXEC|O_NOATIME|O_NOCTTY|O_NOFOLLOW);
         if (fd < 0) {
 
-                if (errno != ENOENT && errno != EPERM && errno != EACCES)
+                if (errno != ENOENT && errno != EPERM && errno != EACCES && errno != ELOOP)
                         log_warning("open(%s) failed: %m", fn);
 
         } else if (file_verify(fd, fn, arg_file_size_max, &st) <= 0) {

commit 22f38abe9a1dbe4bc3ef46b7073df4869778b840
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jan 3 22:37:31 2013 +0100

    man: clarify that specifiers cannot be used in ExecStart='s first argument

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index ddb065e..598e863 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -296,8 +296,9 @@
 
                         <varlistentry>
                                 <term><varname>ExecStart=</varname></term>
-                                <listitem><para>Commands
-                                that are executed when this service is started.
+                                <listitem><para>Commands with their
+                                arguments that are executed when this
+                                service is started.
                                 </para>
 
                                 <para>When
@@ -327,10 +328,15 @@
                                 <varname>Type=forking</varname> is
                                 set, the process started via this
                                 command line will be considered the
-                                main process of the daemon. The
-                                command line accepts '<literal>%</literal>'
-                                specifiers as described in
-                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+                                main process of the daemon.</para>
+
+                                <para>The command line accepts
+                                '<literal>%</literal>' specifiers as
+                                described in
+                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note
+                                that the first argument of the command
+                                line (i.e. the program to execute) may
+                                not include specifiers.</para>
 
                                 <para>Optionally, if the absolute file
                                 name is prefixed with



More information about the systemd-commits mailing list