From 235afe4aa1a86546c1735db7641fcf307c90c544 Mon Sep 17 00:00:00 2001
From: "Thierry.Vignaud" <thierry.vignaud@gmail.com>
Date: Fri, 20 Jun 2014 11:35:43 +0200
Subject: log X.org server logs when it fails to start up (mga#13471)

---
 perl-install/install/NEWS         | 1 +
 perl-install/install/steps_gtk.pm | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/install')

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;
 }
 
-- 
cgit v1.2.1