[systemd-commits] 2 commits - man/daemon.xml src/readahead-collect.c src/readahead-replay.c

[Lennart Poettering]

 man/daemon.xml          |    4 ++--
 src/readahead-collect.c |    3 +++
 src/readahead-replay.c  |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit a76fad090a6a1388fbaa609e8ca37e82223d2bd7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 18 02:26:01 2011 +0100

    readahead: remove misleading error messages
    
    https://bugzilla.redhat.com/show_bug.cgi?id=678255

diff --git a/src/readahead-collect.c b/src/readahead-collect.c
index 4ca6d74..ea07b3f 100644
--- a/src/readahead-collect.c
+++ b/src/readahead-collect.c
@@ -96,6 +96,9 @@ static int pack_file(FILE *pack, const char *fn, bool on_btrfs) {
                 if (errno == ENOENT)
                         return 0;
 
+                if (errno == EPERM || errno == EACCES)
+                        return 0;
+
                 log_warning("open(%s) failed: %m", fn);
                 r = -errno;
                 goto finish;
diff --git a/src/readahead-replay.c b/src/readahead-replay.c
index e9c573a..9447fe0 100644
--- a/src/readahead-replay.c
+++ b/src/readahead-replay.c
@@ -62,7 +62,7 @@ static int unpack_file(FILE *pack) {
 
         if ((fd = open(fn, O_RDONLY|O_CLOEXEC|O_NOATIME|O_NOCTTY|O_NOFOLLOW)) < 0) {
 
-                if (errno != ENOENT)
+                if (errno != ENOENT && errno != EPERM && errno != EACCES)
                         log_warning("open(%s) failed: %m", fn);
 
         } else if (file_verify(fd, fn, arg_file_size_max, &st) <= 0) {

commit d12d0e647a0bf83581e2dba4281a5b93b5428886
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 18 02:25:18 2011 +0100

    man: don't do more reloads than necessary in spec files

diff --git a/man/daemon.xml b/man/daemon.xml
index 7e7039e..ea0e6d2 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -841,7 +841,7 @@ fi
 %preun
 if [ $1 -eq 0 ]; then
         # On uninstall (not upgrade), disable and stop the units
-        /bin/systemctl disable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
+        /bin/systemctl --no-reload disable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
         /bin/systemctl stop foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 fi
 
@@ -870,7 +870,7 @@ fi</programlisting>
 
                         <programlisting>%triggerun -- foobar &lt; 0.47.11-1
 if /sbin/chkconfig foobar ; then
-        /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
+        /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 fi</programlisting>
 
                         <para>Where 0.47.11-1 is the first package