From 0c17fbce55a9a2ca48318a918adce4c58ae79d98 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 28 Mar 2013 21:18:58 +0100 Subject: unit: replace remote-fs-setup.target by network-online.target https://bugzilla.redhat.com/show_bug.cgi?id=787314 --- src/core/mount.c | 12 ++++++------ src/core/special.h | 2 +- src/fstab-generator/fstab-generator.c | 35 +++++++++++++++++++++-------------- 3 files changed, 28 insertions(+), 21 deletions(-) (limited to 'src') 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 */ diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 78d9ce90d7..4eaa52d1c2 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -210,8 +210,9 @@ static int add_mount( bool automount, bool isbind, const char *pre, + const char *pre2, + const char *online, const char *post, - const char *setup, const char *source) { char _cleanup_free_ *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL, @@ -267,10 +268,17 @@ static int add_mount( "After=%s\n", pre); - if (setup) + if (pre2) fprintf(f, + "After=%s\n", + pre2); + + if (online) + fprintf(f, + "After=%s\n" "Wants=%s\n", - setup); + online, + online); fprintf(f, "Conflicts=" SPECIAL_UMOUNT_TARGET "\n" @@ -439,7 +447,7 @@ static int parse_fstab(const char *prefix, bool initrd) { k = add_swap(what, me); else { bool noauto, nofail, automount, isbind; - const char *pre, *post, *setup; + const char *pre, *pre2, *post, *online; noauto = !!hasmntopt(me, "noauto"); nofail = !!hasmntopt(me, "nofail"); @@ -449,26 +457,25 @@ static int parse_fstab(const char *prefix, bool initrd) { isbind = mount_is_bind(me); if (initrd) { + pre = pre2 = online = NULL; post = SPECIAL_INITRD_FS_TARGET; - pre = NULL; - setup = NULL; } else if (mount_in_initrd(me)) { + pre = pre2 = online = NULL; post = SPECIAL_INITRD_ROOT_FS_TARGET; - pre = NULL; - setup = NULL; } else if (mount_is_network(me)) { - post = SPECIAL_REMOTE_FS_TARGET; pre = SPECIAL_REMOTE_FS_PRE_TARGET; - setup = SPECIAL_REMOTE_FS_SETUP_TARGET; + pre2 = SPECIAL_NETWORK_TARGET; + online = SPECIAL_NETWORK_ONLINE_TARGET; + post = SPECIAL_REMOTE_FS_TARGET; } else { - post = SPECIAL_LOCAL_FS_TARGET; pre = SPECIAL_LOCAL_FS_PRE_TARGET; - setup = NULL; + pre2 = online = NULL; + post = SPECIAL_LOCAL_FS_TARGET; } k = add_mount(what, where, me->mnt_type, me->mnt_opts, me->mnt_passno, noauto, nofail, automount, - isbind, pre, post, setup, fstab_path); + isbind, pre, pre2, online, post, fstab_path); } if (k < 0) @@ -552,7 +559,7 @@ static int parse_new_root_from_proc_cmdline(void) { log_debug("Found entry what=%s where=/sysroot type=%s", what, type); r = add_mount(what, "/sysroot", type, opts, 0, false, false, false, - false, NULL, SPECIAL_INITRD_ROOT_FS_TARGET, NULL, "/proc/cmdline"); + false, NULL, NULL, NULL, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline"); return (r < 0) ? r : 0; } -- cgit v1.2.3-54-g00ecf