summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-10-02 14:37:46 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-10-02 14:37:46 +0000
commit60a9ce00147bb95f25f0f52356b9a9fde3b89538 (patch)
treeb887c3e705dd9196015035e18e3c7a053b4cdc8f
parent75fa89cd19fb95f8e7efd2bf8803a3143989d3f4 (diff)
downloaddrakx-60a9ce00147bb95f25f0f52356b9a9fde3b89538.tar
drakx-60a9ce00147bb95f25f0f52356b9a9fde3b89538.tar.gz
drakx-60a9ce00147bb95f25f0f52356b9a9fde3b89538.tar.bz2
drakx-60a9ce00147bb95f25f0f52356b9a9fde3b89538.tar.xz
drakx-60a9ce00147bb95f25f0f52356b9a9fde3b89538.zip
update from oem patch
-rw-r--r--perl-install/patch/patch-nforce.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/patch/patch-nforce.pl b/perl-install/patch/patch-nforce.pl
index 62bee8d42..35587ec75 100644
--- a/perl-install/patch/patch-nforce.pl
+++ b/perl-install/patch/patch-nforce.pl
@@ -10,7 +10,7 @@ undef *afterInstallPackages;
my ($o) = @_;
- #- workaround nforce stuff.
+ # workaround nforce stuff.
#
# modules.pm uses /lib/modules/VERSION/modules*map to know which
# sound drivers to use : this'll cause i810_audio to override
@@ -25,11 +25,11 @@ undef *afterInstallPackages;
# for depmod :
# MODULE_DEVICE_TABLE (pci, <name_of_the struct pci_device_id variable>);
+ #- try to workaround nforce stuff.
foreach (keys %{$o->{packages}{provides}{kernel}}) {
my $p = $o->{packages}{depslist}[$_];
my ($ext, $version, $release) = $p->name =~ /^kernel-([^\d\-]*)-?([^\-]*)\.([^\-\.]*)$/ or next;
-s "$o->{prefix}/lib/modules/$version-$release$ext/kernel/drivers/sound/nvaudio.o.gz" and
- unlink "$o->{prefix}/lib/modules/$version-$release$ext/kernel/drivers/sound/i810_audio.o.gz";
+ run_program::rooted($o->{prefix}, "cp -f /lib/modules/$version-$release$ext/kernel/drivers/sound/nvaudio.o.gz /lib/modules/$version-$release$ext/kernel/drivers/sound/i810_audio.o.gz");
}
-
};