diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-09-19 17:31:42 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-09-19 17:31:42 +0000 |
| commit | 25f65beed0677fa247c513705dbf538225f979c4 (patch) | |
| tree | e0ec937937cba2d6279e97b3b7036fe0856d5bb2 /perl-install/Xconfig.pm | |
| parent | a0b5f74447cc699c43c354cb6397ed554605729b (diff) | |
| download | drakx-backup-do-not-use-25f65beed0677fa247c513705dbf538225f979c4.tar drakx-backup-do-not-use-25f65beed0677fa247c513705dbf538225f979c4.tar.gz drakx-backup-do-not-use-25f65beed0677fa247c513705dbf538225f979c4.tar.bz2 drakx-backup-do-not-use-25f65beed0677fa247c513705dbf538225f979c4.tar.xz drakx-backup-do-not-use-25f65beed0677fa247c513705dbf538225f979c4.zip | |
no_comment
Diffstat (limited to 'perl-install/Xconfig.pm')
| -rw-r--r-- | perl-install/Xconfig.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm index 48b1cddca..ba3dab2f6 100644 --- a/perl-install/Xconfig.pm +++ b/perl-install/Xconfig.pm @@ -6,7 +6,7 @@ use mouse; # otherwise uses the rule substr($keymap, 0, 2) my %keymap_translate = ( cf => "ca_enhanced", - uk => "gb", + uk => "gb", ); @@ -34,7 +34,7 @@ sub getinfoFromXF86Config { my (%c, $depth); $o->{card}{server} ||= $1 if readlink("/etc/X11/X") =~ /XF86_ (\w+)$/x; #- /x for perl2fcalls - + local *F; open F, "/etc/X11/XF86Config" or return {}; foreach (<F>) { @@ -52,7 +52,7 @@ sub getinfoFromXF86Config { $c{memory} ||= $1 if /^\s*VideoRam\s+(\d+)/; $c{vendor} ||= $1 if /^\s*VendorName\s+"(.*?)"/; $c{board} ||= $1 if /^\s*BoardName\s+"(.*?)"/; - + push @{$c{lines}}, $_ unless /(Section|Identifier|VideoRam|VendorName|BoardName)/; } elsif (/^Section "Monitor"/ .. /^EndSection/) { $o->{monitor}{type} ||= $1 if /^\s*Identifier\s+"(.*?)"/; |