diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-07-04 16:08:42 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-07-04 16:08:42 +0000 |
| commit | 009e784a338799a5c98adee947312749bbcd08ad (patch) | |
| tree | 6472a05a2347f7afda8c862aaf413e4829b0f43d | |
| parent | 46be5706259ed4b620df587789d2e2a699809b9b (diff) | |
| download | drakx-009e784a338799a5c98adee947312749bbcd08ad.tar drakx-009e784a338799a5c98adee947312749bbcd08ad.tar.gz drakx-009e784a338799a5c98adee947312749bbcd08ad.tar.bz2 drakx-009e784a338799a5c98adee947312749bbcd08ad.tar.xz drakx-009e784a338799a5c98adee947312749bbcd08ad.zip | |
do not bother configure old Xorg conf files anymore
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index bbbb6accf..c79c843d7 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- service_harddrake: + o do not bother configure old Xorg conf files anymore + Version 10.4.143 - 04 July 2007, by Thierry Vignaud - centralize common textdomains in a single common place, thus diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 781b87ee1..b33d893a4 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -65,7 +65,7 @@ if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) { log::explanations("switch X.org driver from nvidia to nv"); s!Driver "nv.*"!Driver "nv"!g; } - } $_ foreach grep { -e $_ } "/etc/X11/XF86Config-4", "/etc/X11/XF86Config", "/etc/X11/xorg.conf"; + } '/etc/X11/xorg.conf'; require Xconfig::card; Xconfig::card::libgl_config_and_more({ Driver => 'nv' }) if $done; @@ -94,7 +94,7 @@ if (find { $_->{driver} =~ /ATI Radeon/ } detect_devices::probeall()) { s!Driver "fglrx"!Driver "$driver"!g; } s!Driver "fglrx"!Driver "$driver"!g; - } $_ foreach grep { -e $_ } "/etc/X11/XF86Config-4", "/etc/X11/XF86Config", "/etc/X11/xorg.conf"; + } '/etc/X11/xorg.conf'; require Xconfig::card; Xconfig::card::libgl_config_and_more({ Driver => $driver }); |