summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-11-17 14:41:15 +0000
committerFrancois Pons <fpons@mandriva.com>1999-11-17 14:41:15 +0000
commitcfe7ff7eb477051523765ee5f08f513e81357177 (patch)
tree5582c8b92e16dfee49807a7b7a752d9b2df74e5c /perl-install/Xconfig.pm
parentbb9aa2bfb3eb697ac43d9be3646a4a30b8a7bf44 (diff)
downloaddrakx-backup-do-not-use-cfe7ff7eb477051523765ee5f08f513e81357177.tar
drakx-backup-do-not-use-cfe7ff7eb477051523765ee5f08f513e81357177.tar.gz
drakx-backup-do-not-use-cfe7ff7eb477051523765ee5f08f513e81357177.tar.bz2
drakx-backup-do-not-use-cfe7ff7eb477051523765ee5f08f513e81357177.tar.xz
drakx-backup-do-not-use-cfe7ff7eb477051523765ee5f08f513e81357177.zip
*** empty log message ***
Diffstat (limited to 'perl-install/Xconfig.pm')
-rw-r--r--perl-install/Xconfig.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index 67f5d4138..9f2ae364c 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -61,9 +61,11 @@ sub getinfoFromXF86Config {
$c{flags}{needVideoRam} ||= 1 if /^\s*VideoRam\s+/;
$c{vendor} ||= $1 if /^\s*VendorName\s+"(.*?)"/;
$c{board} ||= $1 if /^\s*BoardName\s+"(.*?)"/;
+ $c{options}{$1} ||= 1 if /^\s*Option\s+"(.*?)"/;
+ $c{options}{$1} ||= 0 if /^\s*#\s*Option\s+"(.*?)"/;
#- clockchip, ramdac, dacspeed read with following line.
- push @{$c{lines}}, $_ unless /(Section|Identifier|VideoRam|VendorName|BoardName)/;
+ push @{$c{lines}}, $_ unless /(Section|Identifier|VideoRam|VendorName|BoardName|Option)/;
add2hash($o->{card} ||= {}, \%c) if ($i =~ /E0/ && $c{type} && $c{type} ne "Generic VGA");
} elsif (/^Section "Monitor"/ .. /^EndSection/) {