Use %m instead of strerror(errno) where appropiate

[elogind.git] / src / nspawn / nspawn.c

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 6be4dcae591d61f2c13f73f92bec8935e58ac83f..73158a051831edf74a5db86ee8027b471a5e28c8 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -657,7 +657,7 @@ static int mount_binds(const char *dest, char **l, unsigned long flags) {
                                 return r;
                         }
                 } else {
-                        log_error("Failed to bind mount %s: %s", *x, strerror(errno));
+                        log_error("Failed to bind mount %s: %m", *x);
                         return -errno;
                 }
                 /* Create the mount point, but be conservative -- refuse to create block
@@ -1143,10 +1143,8 @@ static int setup_journal(const char *directory) {
         } else if (access(p, F_OK) < 0)
                 return 0;
 
-        if (dir_is_empty(q) == 0) {
-                log_error("%s not empty.", q);
-                return -ENOTEMPTY;
-        }
+        if (dir_is_empty(q) == 0)
+                log_warning("%s is not empty, proceeding anyway.", q);
 
         r = mkdir_p(q, 0755);
         if (r < 0) {
@@ -3057,7 +3055,7 @@ int main(int argc, char *argv[]) {
                 fds = NULL;
 
                 /* Wait until the child reported that it is ready with
-                 * all it needs to do with priviliges. After we got
+                 * all it needs to do with privileges. After we got
                  * the notification we can make the process join its
                  * cgroup which might limit what it can do */
                 eventfd_read(child_ready_fd, &x);