aboutsummaryrefslogtreecommitdiffstats
path: root/src/dumm
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2008-10-07 16:31:41 +0000
committerMartin Willi <martin@strongswan.org>2008-10-07 16:31:41 +0000
commitc8ba5125d6915760926b0b29d1bdca1e5c986c32 (patch)
tree629ac5961285333a56e47a251cceb4e1b5b0a9a9 /src/dumm
parent693a244d0fddccd11f3a18112519d3593e0eb197 (diff)
downloadstrongswan-c8ba5125d6915760926b0b29d1bdca1e5c986c32.tar.bz2
strongswan-c8ba5125d6915760926b0b29d1bdca1e5c986c32.tar.xz
guest bootup waits for init, not for network stack (fixes 2.6.27 guest kernels)
Diffstat (limited to 'src/dumm')
-rw-r--r--src/dumm/mconsole.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/dumm/mconsole.c b/src/dumm/mconsole.c
index 53f3e5644..c6e0c2f08 100644
--- a/src/dumm/mconsole.c
+++ b/src/dumm/mconsole.c
@@ -209,31 +209,14 @@ static int exec(private_mconsole_t *this, void(*cb)(void*,char*,size_t),
*/
static bool wait_bootup(private_mconsole_t *this)
{
- int res;
-
- while (TRUE)
+ /* wait for init process to appear */
+ while (request(this, ignore, NULL, "exec ps -p 1 > /dev/null"))
{
- res = request(this, ignore, NULL, "config eth9=mcast");
- if (res < 0)
- {
- return FALSE;
- }
- if (res == 0)
- {
- while (request(this, ignore, NULL, "remove eth9") != 0)
- {
- usleep(50000);
- }
- return TRUE;
- }
if (this->idle)
{
this->idle();
}
- else
- {
- usleep(50000);
- }
+ usleep(100000);
}
}