From 6b7e1e5ba3348b4f6c2bcae6fe659d742991b63b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 3 Jan 2002 17:46:02 +0000
Subject: save the output of ddcxinfos before modprobe'ing i810fb, and use that
 output for Xconfig (when i810fb is modprobe'd, ddc probe doesn't work
 anymore)

---
 perl-install/any.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'perl-install/any.pm')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 1a8e5657a..389c57511 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -868,7 +868,7 @@ sub report_bug {
       header("partitions"), cat_("/proc/partitions"),
       header("cpuinfo"), cat_("/proc/cpuinfo"),
       header("syslog"), cat_("/tmp/syslog"),
-      header("ddcxinfos"), `$ENV{LD_LOADER} ddcxinfos`,
+      header("ddcxinfos"), ddcxinfos(),
       header("stage1.log"), cat_("/tmp/stage1.log"),
       header("ddebug.log"), cat_("/tmp/ddebug.log"),
       header("install.log"), cat_("$prefix/root/install.log"),
@@ -911,4 +911,14 @@ Or on the command line use: "usermod -G fileshare user_name"');
     }
 }
 
+sub ddcxinfos {
+    if ($::isInstall && -e "/tmp/ddcxinfos") {
+	cat_("/tmp/ddcxinfos");
+    } else {
+	my @l = `$ENV{LD_LOADER} ddcxinfos`;
+	output("/tmp/ddcxinfos", @l) if $::isInstall;
+	@l;
+    }
+}
+
 1;
-- 
cgit v1.2.1