summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-02 01:31:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-02 01:31:47 +0000
commit9720840dad48e3fff2ea3e87f0444533c59721ab (patch)
tree643f6d5c5f89910b05616bbf6a05fec4297e34e7
parenteb0c5581bf9f128bc4ebcf76c42b7e5ca0687c11 (diff)
downloaddrakx-9720840dad48e3fff2ea3e87f0444533c59721ab.tar
drakx-9720840dad48e3fff2ea3e87f0444533c59721ab.tar.gz
drakx-9720840dad48e3fff2ea3e87f0444533c59721ab.tar.bz2
drakx-9720840dad48e3fff2ea3e87f0444533c59721ab.tar.xz
drakx-9720840dad48e3fff2ea3e87f0444533c59721ab.zip
check the XF86Config and/or XF86Config-4 exist before modifying it
(otherwise it creates an empty file) (bugzilla #10487)
-rwxr-xr-xperl-install/standalone/service_harddrake2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 8833f6b5b..1cb00f405 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -46,7 +46,7 @@ if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) {
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";
+ } $_ foreach grep { -e $_ } "/etc/X11/XF86Config-4", "/etc/X11/XF86Config";
}
}