diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-03-28 21:18:58 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-03-29 03:07:17 +0100 |
| commit | 0c17fbce55a9a2ca48318a918adce4c58ae79d98 (patch) | |
| tree | eb9eec0343c408bdde16b684dcdca2db56ed6957 /src/core | |
| parent | 78a04605888f987ea4449bd088d679c7075ab533 (diff) | |
unit: replace remote-fs-setup.target by network-online.target
https://bugzilla.redhat.com/show_bug.cgi?id=787314
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/mount.c | 12 | ||||
| -rw-r--r-- | src/core/special.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index 3c63a391db..7839300110 100644 --- 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, *after2, *setup; + int r; assert(m); @@ -459,11 +459,11 @@ static int mount_add_default_dependencies(Mount *m) { if (mount_is_network(p)) { after = SPECIAL_REMOTE_FS_PRE_TARGET; after2 = SPECIAL_NETWORK_TARGET; - setup = SPECIAL_REMOTE_FS_SETUP_TARGET; + online = SPECIAL_NETWORK_ONLINE_TARGET; } else { after = SPECIAL_LOCAL_FS_PRE_TARGET; after2 = NULL; - setup = NULL; + online = NULL; } r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true); @@ -476,8 +476,8 @@ static int mount_add_default_dependencies(Mount *m) { return r; } - if (setup) { - r = unit_add_dependency_by_name(UNIT(m), UNIT_WANTS, setup, NULL, true); + if (online) { + r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_WANTS, UNIT_AFTER, online, NULL, true); if (r < 0) return r; } diff --git a/src/core/special.h b/src/core/special.h index dae7446d73..a9b50bce05 100644 --- a/src/core/special.h +++ b/src/core/special.h @@ -54,8 +54,8 @@ #define SPECIAL_INITRD_ROOT_FS_TARGET "initrd-root-fs.target" #define SPECIAL_REMOTE_FS_TARGET "remote-fs.target" /* LSB's $remote_fs */ #define SPECIAL_REMOTE_FS_PRE_TARGET "remote-fs-pre.target" -#define SPECIAL_REMOTE_FS_SETUP_TARGET "remote-fs-setup.target" #define SPECIAL_SWAP_TARGET "swap.target" +#define SPECIAL_NETWORK_ONLINE_TARGET "network-online.target" #define SPECIAL_BASIC_TARGET "basic.target" /* LSB compatibility */ |