X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount-setup.c;h=342f5520c9f3f1011c6c0602e986be5679756798;hb=c09da72900b03fcddade06643f24c6357f3e0482;hp=fc538d0aa46ae4fe53a1570715120702df77b0c0;hpb=68d4c4526306cf464257aed269b21a73672bbe29;p=elogind.git

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index fc538d0aa..342f5520c 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -235,7 +235,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
 
         f = fopen("/proc/cgroups", "re");
         if (!f) {
-                log_error("Failed to enumerate cgroup controllers: %m");
+                log_error_errno(errno, "Failed to enumerate cgroup controllers: %m");
                 return 0;
         }
 
@@ -340,10 +340,8 @@ int mount_cgroup_controllers(char ***join_controllers) {
                                         return log_oom();
 
                                 r = symlink(options, t);
-                                if (r < 0 && errno != EEXIST) {
-                                        log_error("Failed to create symlink %s: %m", t);
-                                        return -errno;
-                                }
+                                if (r < 0 && errno != EEXIST)
+                                        return log_error_errno(errno, "Failed to create symlink %s: %m", t);
                         }
                 }
         }
@@ -428,7 +426,7 @@ int mount_setup(bool loaded_policy) {
          * propagation mode to private if needed. */
         if (detect_container(NULL) <= 0)
                 if (mount(NULL, "/", NULL, MS_REC|MS_SHARED, NULL) < 0)
-                        log_warning("Failed to set up the root directory for shared mount propagation: %m");
+                        log_warning_errno(errno, "Failed to set up the root directory for shared mount propagation: %m");
 
         /* Create a few directories we always want around, Note that
          * sd_booted() checks for /run/systemd/system, so this mkdir