From 21a64af3da7dd58acf54110c00bea52c4d589ba6 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mandriva.org>
Date: Sun, 3 Jan 2010 16:29:59 +0000
Subject: - monitor-probe:   o do not probe using X if DMI probe was successful

---
 NEWS          | 3 +++
 monitor-probe | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index c85235b..f20cf4c 100644
--- a/NEWS
+++ b/NEWS
@@ -50,6 +50,9 @@
 - monitor-probe-using-X:
   o accept EDID data that contains extension blocks
 
+- monitor-probe:
+  o do not probe using X if DMI probe was successful
+
 Version 2.5 - 18 October 2009, by Anssi Hannula
 
 - monitor-probe-using-X:
diff --git a/monitor-probe b/monitor-probe
index e41578c..e9cc27f 100755
--- a/monitor-probe
+++ b/monitor-probe
@@ -27,7 +27,7 @@ fi
 monitor-edid --try-in-console $opt_v && exit 0
 
 [ -n "$opt_v" ] && echo "probing DMI" 1>&2
-lspcidrake | sed -n 's/^\(Resolution\|Diagonal_size\):\([^:]*\):.*/\1: \2/p'
+lspcidrake | sed -n 's/^\(Resolution\|Diagonal_size\):\([^:]*\):.*/\1: \2/p' | grep . && exit 0
 
 [ -n "$opt_v" ] && echo "probing using X" 1>&2
 monitor-probe-using-X $X_driver && exit 0
-- 
cgit v1.2.1