unit: replace remote-fs-setup.target by network-online.target

[elogind.git] / src / core / mount.c

diff --git a/src/core/mount.c b/src/core/mount.c
index c4074ebd2e6cc04ce416d70bbf1588eee73c7756..78393001104d131174dc18e7ef106cb5a96feab4 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -439,9 +439,9 @@ static int mount_add_quota_links(Mount *m) {
 }
 
 static int mount_add_default_dependencies(Mount *m) {
-        int r;
+        const char *after, *after2, *online;
         MountParameters *p;
-        const char *after, *setup;
+        int r;
 
         assert(m);
 
@@ -458,18 +458,26 @@ static int mount_add_default_dependencies(Mount *m) {
 
         if (mount_is_network(p)) {
                 after = SPECIAL_REMOTE_FS_PRE_TARGET;
-                setup = SPECIAL_REMOTE_FS_SETUP_TARGET;
+                after2 = SPECIAL_NETWORK_TARGET;
+                online = SPECIAL_NETWORK_ONLINE_TARGET;
         } else {
                 after = SPECIAL_LOCAL_FS_PRE_TARGET;
-                setup = NULL;
+                after2 = NULL;
+                online = NULL;
         }
 
         r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true);
         if (r < 0)
                 return r;
 
-        if (setup) {
-                r = unit_add_dependency_by_name(UNIT(m), UNIT_WANTS, setup, NULL, true);
+        if (after2) {
+                r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true);
+                if (r < 0)
+                        return r;
+        }
+
+        if (online) {
+                r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_WANTS, UNIT_AFTER, online, NULL, true);
                 if (r < 0)
                         return r;
         }