diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-20 23:28:37 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-20 23:28:37 +0000 |
| commit | 62c6ff8cb3eddc2aea72312299c1d886cf2fdc87 (patch) | |
| tree | a8ecb35c6597e5fefc06a1f83c7fcd15249f62b4 | |
| parent | ddf079a9ac37e33407b07c8a3b0844fceec12de5 (diff) | |
| download | drakx-62c6ff8cb3eddc2aea72312299c1d886cf2fdc87.tar drakx-62c6ff8cb3eddc2aea72312299c1d886cf2fdc87.tar.gz drakx-62c6ff8cb3eddc2aea72312299c1d886cf2fdc87.tar.bz2 drakx-62c6ff8cb3eddc2aea72312299c1d886cf2fdc87.tar.xz drakx-62c6ff8cb3eddc2aea72312299c1d886cf2fdc87.zip | |
only log about nv <-> nvidia swtich only if we do have to perform it
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index ba59c7cb1..8bd049f31 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -35,11 +35,17 @@ if ($curr_kernel ne $prev_kernel) { if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) { if (find { -e join('', "/lib/modules/", c::kernel_version(), "/kernel/drivers/$_") } map { ("video/$_", "char/$_") } qw(NVdriver nvidia.o nvidia.o.gz nvidia.ko nvidia.ko.gz)) { - #log::explanations("switch XFree86 driver from nv to nvidia"); - #substInFile { s!Driver "nv.*"!Driver "nvidia"!g; s!#*( Load.*glx)!\1!g } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; + # substInFile { + # log::explanations("switch XFree86 driver from nv to nvidia") if /Driver "nv"/; + # s!Driver "nv.*"!Driver "nvidia"!g; + # s!#*( Load.*glx)!\1!g; + # } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; } else { - log::explanations("switch XFree86 driver from nvidia to nv"); - substInFile { s!Driver "nv.*"!Driver "nv"!g; s!([^#]Load.*glx)!#\1!g } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; + substInFile { + log::explanations("switch XFree86 driver from nvidia to nv") if /Driver "nv.+"/; + s!Driver "nv.*"!Driver "nv"!g; + s!([^#]Load.*glx)!#\1!g; + } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; } } |