summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-09 16:50:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-09 16:50:43 +0000
commitb0e41e74291b4f03c8c147ac3da0448a0d8a538f (patch)
tree23348f68479535861053abec43d233e72af302ce
parentaef3c96fc93098789b74ed1b76e6e1f1222c58fd (diff)
downloaddrakx-b0e41e74291b4f03c8c147ac3da0448a0d8a538f.tar
drakx-b0e41e74291b4f03c8c147ac3da0448a0d8a538f.tar.gz
drakx-b0e41e74291b4f03c8c147ac3da0448a0d8a538f.tar.bz2
drakx-b0e41e74291b4f03c8c147ac3da0448a0d8a538f.tar.xz
drakx-b0e41e74291b4f03c8c147ac3da0448a0d8a538f.zip
commit warly's fix in 10.1 branch
-rw-r--r--perl-install/install_steps.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index b27a56382..df6c9e28e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -631,11 +631,12 @@ sub updateModulesFromFloppy {
my @dest_files = map { chomp_($_) } run_program::rooted_get_stdout($o->{prefix}, 'find', '/lib/modules');
foreach my $s (@src_files) {
log::l("found updatable module $s");
- my ($sfile, $sext) = $s =~ m!([^/\.]*\.k?o)(?:\.gz|\.bz2)?$!;
+ my ($sfile, $sext) = $s =~ m!([^/\.]*\.k?o)(\.gz|\.bz2)?$!;
my $qsfile = quotemeta $sfile;
my $qsext = quotemeta $sext;
foreach my $target (@dest_files) {
$target =~ /$qsfile/ or next;
+ $target = "$o->{prefix}/$target";
eval { cp_af($s, $target) };
if ($@) {
log::l("updating module $target by $s failed: $@");