diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-20 23:29:20 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-20 23:29:20 +0000 |
| commit | d65c0b6ebdc62d2cb0da2e34ad66fece6883ba6c (patch) | |
| tree | 1d4faa82a64dcfbf26f616e0bff626c72f9137a4 /perl-install/standalone/service_harddrake | |
| parent | 62c6ff8cb3eddc2aea72312299c1d886cf2fdc87 (diff) | |
| download | drakx-d65c0b6ebdc62d2cb0da2e34ad66fece6883ba6c.tar drakx-d65c0b6ebdc62d2cb0da2e34ad66fece6883ba6c.tar.gz drakx-d65c0b6ebdc62d2cb0da2e34ad66fece6883ba6c.tar.bz2 drakx-d65c0b6ebdc62d2cb0da2e34ad66fece6883ba6c.tar.xz drakx-d65c0b6ebdc62d2cb0da2e34ad66fece6883ba6c.zip | |
fix warnings
Diffstat (limited to 'perl-install/standalone/service_harddrake')
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 8bd049f31..590e259c5 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -25,7 +25,7 @@ modules::mergein_conf('/etc/modules.conf'); # autoreconfigure the mouse on major kernel change: my $prev_kernel = { getVarsFromSh("$hw_sysconfdir/kernel") }->{KERNEL}; my $curr_kernel = c::kernel_version(); -$curr_kernel =~ s/(^\d+\.\d+).*/\1/; +$curr_kernel =~ s/(^\d+\.\d+).*/$1/; setVarsInSh("$hw_sysconfdir/kernel", { KERNEL => $curr_kernel }); if ($curr_kernel ne $prev_kernel) { require class_discard; @@ -44,7 +44,7 @@ if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) { substInFile { log::explanations("switch XFree86 driver from nvidia to nv") if /Driver "nv.+"/; s!Driver "nv.*"!Driver "nv"!g; - s!([^#]Load.*glx)!#\1!g; + s!([^#]Load.*glx)!#$1!g; } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; } } |