diff options
| author | Thierry.Vignaud <thierry.vignaud@gmail.com> | 2014-06-20 11:35:43 +0200 |
|---|---|---|
| committer | Pascal Terjan <pterjan@gmail.com> | 2014-10-20 21:29:55 +0000 |
| commit | 235afe4aa1a86546c1735db7641fcf307c90c544 (patch) | |
| tree | 1682234e0d606a2221f840f0514e05f1c6d2d1e5 | |
| parent | f6274da2b18edda9bbbe82e3e40d5be56449e106 (diff) | |
| download | drakx-235afe4aa1a86546c1735db7641fcf307c90c544.tar drakx-235afe4aa1a86546c1735db7641fcf307c90c544.tar.gz drakx-235afe4aa1a86546c1735db7641fcf307c90c544.tar.bz2 drakx-235afe4aa1a86546c1735db7641fcf307c90c544.tar.xz drakx-235afe4aa1a86546c1735db7641fcf307c90c544.zip | |
log X.org server logs when it fails to start up (mga#13471)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b2fa1fd67..783b60e90 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - adwaita-gtk3-theme no longer provides a settings.ini file +- log X.org server logs when it fails to start up (mga#13471, ...) - recognize hyper-v paravirtual network driver Version 16.38 - 17 August 2014 diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index c0ce47b3c..b78a25b48 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -135,7 +135,8 @@ sub _launchX { log::l("waiting for the server to start ($_ $nb)"); if (!fuzzy_pidofs(qr/\b$server\b/)) { log::l("Server died"); - return 0; + log::l(any::header("Xorg.log"), cat_("/var/log/Xorg.0.log")); + 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 :-( @@ -147,6 +148,7 @@ sub _launchX { sleep 1; } log::l("Timeout!!"); + log::l(any::header("Xorg.log"), cat_("/var/log/Xorg.0.log")); 0; } |