journald: use SCM_SECURITY to race-freely determine peer SELinux label

[elogind.git] / src / mount.c

diff --git a/src/mount.c b/src/mount.c
index 0eba1a59248dc34a08893dcc45cb57e6bf8ff3e0..982715a6dba86ddd2f34c6666ab53318de3f1c93 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -271,7 +271,7 @@ static char* mount_test_option(const char *haystack, const char *needle) {
          * struct mntent */
 
         if (!haystack)
-                return false;
+                return NULL;
 
         zero(me);
         me.mnt_opts = (char*) haystack;
@@ -320,7 +320,7 @@ static bool needs_quota(MountParameters *p) {
 }
 
 static int mount_add_fstab_links(Mount *m) {
-        const char *target, *after = NULL, *after2 = NULL;
+        const char *target, *after, *tu_wants = NULL;
         MountParameters *p;
         Unit *tu;
         int r;
@@ -350,23 +350,27 @@ static int mount_add_fstab_links(Mount *m) {
 
         if (mount_is_network(p)) {
                 target = SPECIAL_REMOTE_FS_TARGET;
-                after = SPECIAL_REMOTE_FS_PRE_TARGET;
-                after2 = SPECIAL_NETWORK_TARGET;
+                after = tu_wants = SPECIAL_REMOTE_FS_PRE_TARGET;
         } else {
                 target = SPECIAL_LOCAL_FS_TARGET;
                 after = SPECIAL_LOCAL_FS_PRE_TARGET;
         }
 
-        if ((r = manager_load_unit(UNIT(m)->manager, target, NULL, NULL, &tu)) < 0)
+        r = manager_load_unit(UNIT(m)->manager, target, NULL, NULL, &tu);
+        if (r < 0)
                 return r;
 
-        if (after)
-                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
+        if (tu_wants) {
+                r = unit_add_dependency_by_name(tu, UNIT_WANTS, tu_wants, NULL, true);
+                if (r < 0)
                         return r;
+        }
 
-        if (after2)
-                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true)) < 0)
+        if (after) {
+                r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true);
+                if (r < 0)
                         return r;
+        }
 
         if (automount) {
                 Unit *am;
@@ -750,6 +754,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sMount State: %s\n"
+                "%sResult: %s\n"
                 "%sWhere: %s\n"
                 "%sWhat: %s\n"
                 "%sFile System Type: %s\n"
@@ -759,6 +764,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sFrom fragment: %s\n"
                 "%sDirectoryMode: %04o\n",
                 prefix, mount_state_to_string(m->state),
+                prefix, mount_result_to_string(m->result),
                 prefix, m->where,
                 prefix, strna(p->what),
                 prefix, strna(p->fstype),
@@ -1572,7 +1578,7 @@ static int mount_load_etc_fstab(Manager *m) {
                 free(what);
                 free(where);
 
-                if (r < 0)
+                if (k < 0)
                         r = k;
         }