diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-06 18:42:23 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-11-14 18:19:21 -0700 |
| commit | 16e5556c8e26626d558894e75bef5af8942a023f (patch) | |
| tree | d51ce91028a116ae785f3d01f5a97635784837c9 /init | |
| parent | f10fa3b121a86d8dd0a49166aae71a189f340397 (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 ccd91c5ba7a..b3e7e7b283d 100644 --- a/init/main.c +++ b/init/main.c @@ -904,7 +904,7 @@ static void __init kernel_init_freeable(void) * 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 |