diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-06 18:42:23 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:47:58 -0600 |
| commit | 31c6cb196ffeed7478b00dde1367ea9e374dc14d (patch) | |
| tree | 6fefc2b018829093c6a5df683787468ea1a577cb /init | |
| parent | 944c2da8b73334c989bf900ed7b09d486844e59a (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 | 6 | ||||
| -rw-r--r-- | init/main.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 1ecfa056c48..51192a48d09 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -572,6 +572,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 5d96791e281..1bc53d75b0b 100644 --- a/init/main.c +++ b/init/main.c @@ -833,7 +833,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 |