diff options
author | Andy Whitcroft <apw@canonical.com> | 2011-01-06 18:42:23 +0000 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2012-06-21 17:21:54 -0600 |
commit | 4c2c7541d1817e54eb43593e5bef398ec3b99963 (patch) | |
tree | 5a72e7dfc8f36d45ae1684c732e3fbb62492801e /init | |
parent | 51260f468853ad4bb18f35f7ded1b2d16f1cfe0e (diff) |
UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in it
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'init')
-rw-r--r-- | init/initramfs.c | 7 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 1ae8873570c..c5a41234666 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -19,6 +19,7 @@ #include <linux/syscalls.h> #include <linux/utime.h> #include <linux/async.h> +#include <linux/export.h> static __initdata char *message; static void __init error(char *x) @@ -582,6 +583,12 @@ static void __init clean_rootfs(void) LIST_HEAD(populate_rootfs_domain); +void populate_rootfs_wait(void) +{ + async_synchronize_full_domain(&populate_rootfs_domain); +} +EXPORT_SYMBOL(populate_rootfs_wait); + static void __init async_populate_rootfs(void) { char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size); diff --git a/init/main.c b/init/main.c index 1118f3a159f..c5667ec14e9 100644 --- a/init/main.c +++ b/init/main.c @@ -893,7 +893,7 @@ static int __init kernel_init(void * unused) * We need to ensure that the filesystem is ready by this point, wait for * async_populate_rootfs to complete. */ - async_synchronize_full_domain(&populate_rootfs_domain); + populate_rootfs_wait(); /* * check if there is an early userspace init. If yes, let it do all |