aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2010-01-03 16:29:59 +0000
committerAnssi Hannula <anssi@mandriva.org>2010-01-03 16:29:59 +0000
commit21a64af3da7dd58acf54110c00bea52c4d589ba6 (patch)
tree622a7046fb1e5132fee0cb53ccc0df9cefc520c4
parent0864b2b7e5ba82a34fea36202959a94240f46d47 (diff)
downloadmonitor-edid-21a64af3da7dd58acf54110c00bea52c4d589ba6.tar
monitor-edid-21a64af3da7dd58acf54110c00bea52c4d589ba6.tar.gz
monitor-edid-21a64af3da7dd58acf54110c00bea52c4d589ba6.tar.bz2
monitor-edid-21a64af3da7dd58acf54110c00bea52c4d589ba6.tar.xz
monitor-edid-21a64af3da7dd58acf54110c00bea52c4d589ba6.zip
- monitor-probe:
o do not probe using X if DMI probe was successful
-rw-r--r--NEWS3
-rwxr-xr-xmonitor-probe2
2 files changed, 4 insertions, 1 deletions
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