diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-06 18:42:23 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-23 23:19:41 -0600 |
| commit | db8d04bb83b49a967251198d8bb566c97c566f91 (patch) | |
| tree | 4afe5ef74fff4c074f6be6b997ae6aeb8145b7f0 /init | |
| parent | 98bd34ff2833341139fab57bf7f73e5129c38130 (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 91312f76e1c..b33d6aee82f 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -9,6 +9,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) @@ -572,6 +573,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 89895a7dcf7..f75e7804525 100644 --- a/init/main.c +++ b/init/main.c @@ -892,7 +892,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 |