summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-09-16 01:39:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-09-16 01:39:33 +0000
commit06089883acc83a33d308ee7fcc7fc7d3e48e1d89 (patch)
tree0d1727f1d71de323e3f40d6d7021da995f6d09d3
parent836837315047d3f2c616759dcaff181b4c476895 (diff)
downloaddrakx-06089883acc83a33d308ee7fcc7fc7d3e48e1d89.tar
drakx-06089883acc83a33d308ee7fcc7fc7d3e48e1d89.tar.gz
drakx-06089883acc83a33d308ee7fcc7fc7d3e48e1d89.tar.bz2
drakx-06089883acc83a33d308ee7fcc7fc7d3e48e1d89.tar.xz
drakx-06089883acc83a33d308ee7fcc7fc7d3e48e1d89.zip
on a test here, a "Server died" occured whereas the server is running.
i think it can occur if the server is in fact not even started. Trying to handle this case
-rw-r--r--perl-install/install_steps_gtk.pm9
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 4cbe537f9..c1c9f33ba 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -61,9 +61,15 @@ sub new($$) {
c::setsid();
exec $server, @options or c::_exit(1);
}
+
+ #- wait for the server to start
+ foreach (1..5) {
+ sleep 1;
+ last if fuzzy_pidofs(qr/\b$server\b/);
+ log::l("$server still not running, trying again");
+ }
my $nb;
foreach (1..60) {
- sleep 1;
log::l("Server died"), return 0 if !fuzzy_pidofs(qr/\b$server\b/);
$nb++ if xf86misc::main::Xtest($wanted_DISPLAY);
if ($nb > 2) { #- one succeeded test is not enough :-(
@@ -71,6 +77,7 @@ sub new($$) {
log::l("AFAIK X server is up");
return 1;
}
+ sleep 1;
}
log::l("Timeout!!");
0;